Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: [SCSI] scsi_transport_fc: fixup netlink arguments
This commit is contained in:
commit
4f5537de7c
1 changed files with 4 additions and 2 deletions
|
@ -480,7 +480,8 @@ fc_host_post_event(struct Scsi_Host *shost, u32 event_number,
|
||||||
event->event_code = event_code;
|
event->event_code = event_code;
|
||||||
event->event_data = event_data;
|
event->event_data = event_data;
|
||||||
|
|
||||||
err = nlmsg_multicast(scsi_nl_sock, skb, 0, SCSI_NL_GRP_FC_EVENTS);
|
err = nlmsg_multicast(scsi_nl_sock, skb, 0, SCSI_NL_GRP_FC_EVENTS,
|
||||||
|
GFP_KERNEL);
|
||||||
if (err && (err != -ESRCH)) /* filter no recipient errors */
|
if (err && (err != -ESRCH)) /* filter no recipient errors */
|
||||||
/* nlmsg_multicast already kfree_skb'd */
|
/* nlmsg_multicast already kfree_skb'd */
|
||||||
goto send_fail;
|
goto send_fail;
|
||||||
|
@ -554,7 +555,8 @@ fc_host_post_vendor_event(struct Scsi_Host *shost, u32 event_number,
|
||||||
event->event_code = FCH_EVT_VENDOR_UNIQUE;
|
event->event_code = FCH_EVT_VENDOR_UNIQUE;
|
||||||
memcpy(&event->event_data, data_buf, data_len);
|
memcpy(&event->event_data, data_buf, data_len);
|
||||||
|
|
||||||
err = nlmsg_multicast(scsi_nl_sock, skb, 0, SCSI_NL_GRP_FC_EVENTS);
|
err = nlmsg_multicast(scsi_nl_sock, skb, 0, SCSI_NL_GRP_FC_EVENTS,
|
||||||
|
GFP_KERNEL);
|
||||||
if (err && (err != -ESRCH)) /* filter no recipient errors */
|
if (err && (err != -ESRCH)) /* filter no recipient errors */
|
||||||
/* nlmsg_multicast already kfree_skb'd */
|
/* nlmsg_multicast already kfree_skb'd */
|
||||||
goto send_vendor_fail;
|
goto send_vendor_fail;
|
||||||
|
|
Loading…
Reference in a new issue