aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-09-23 23:41:53 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-23 23:41:53 -0400
commit4f5537de7c1531398e84e18a24f667e49cc94208 (patch)
treefe598e6cda4715e0af97e62d6084c00a1bb42475
parentf164c42161d21368d9cd4d6d6efc158baa2618db (diff)
parent1b73c4bb063c4aa0cdc25425809bb87f65ee75af (diff)
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
-rw-r--r--drivers/scsi/scsi_transport_fc.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index 4ab176ed480d..38c215a78f69 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -480,7 +480,8 @@ fc_host_post_event(struct Scsi_Host *shost, u32 event_number,
480 event->event_code = event_code; 480 event->event_code = event_code;
481 event->event_data = event_data; 481 event->event_data = event_data;
482 482
483 err = nlmsg_multicast(scsi_nl_sock, skb, 0, SCSI_NL_GRP_FC_EVENTS); 483 err = nlmsg_multicast(scsi_nl_sock, skb, 0, SCSI_NL_GRP_FC_EVENTS,
484 GFP_KERNEL);
484 if (err && (err != -ESRCH)) /* filter no recipient errors */ 485 if (err && (err != -ESRCH)) /* filter no recipient errors */
485 /* nlmsg_multicast already kfree_skb'd */ 486 /* nlmsg_multicast already kfree_skb'd */
486 goto send_fail; 487 goto send_fail;
@@ -554,7 +555,8 @@ fc_host_post_vendor_event(struct Scsi_Host *shost, u32 event_number,
554 event->event_code = FCH_EVT_VENDOR_UNIQUE; 555 event->event_code = FCH_EVT_VENDOR_UNIQUE;
555 memcpy(&event->event_data, data_buf, data_len); 556 memcpy(&event->event_data, data_buf, data_len);
556 557
557 err = nlmsg_multicast(scsi_nl_sock, skb, 0, SCSI_NL_GRP_FC_EVENTS); 558 err = nlmsg_multicast(scsi_nl_sock, skb, 0, SCSI_NL_GRP_FC_EVENTS,
559 GFP_KERNEL);
558 if (err && (err != -ESRCH)) /* filter no recipient errors */ 560 if (err && (err != -ESRCH)) /* filter no recipient errors */
559 /* nlmsg_multicast already kfree_skb'd */ 561 /* nlmsg_multicast already kfree_skb'd */
560 goto send_vendor_fail; 562 goto send_vendor_fail;