diff options
| author |   Mike Christie <michaelc@cs.wisc.edu> | 2006-02-01 21:06:56 -0600 |
|---|---|---|
| committer |   <jejb@mulgrave.il.steeleye.com> | 2006-02-04 16:18:09 -0600 |
| commit | 5b940adf5b341b12dbb94e7cbdb416b35f52017b (patch) | |
| tree | 8f436052e75128929ffd30b32118f694eea56d10 /drivers/scsi/scsi_transport_iscsi.c | |
| parent | [SCSI] iscsi update: cleanup iscsi class interface (diff) | |
| download | linux-dev-5b940adf5b341b12dbb94e7cbdb416b35f52017b.tar.xz linux-dev-5b940adf5b341b12dbb94e7cbdb416b35f52017b.zip | |
[SCSI] iscsi update: pass correct skb to skb_trim
>From da-x@monatomic.org:
Wrong skb is passed to skb_trim in iscsi_if_get_stats.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: Alex Aizman <itn780@yahoo.com>
Signed-off-by: Dmitry Yusupov <dmitry_yus@yahoo.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/scsi_transport_iscsi.c')
| -rw-r--r-- | drivers/scsi/scsi_transport_iscsi.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c index b61868587dca..79ca29ee1aee 100644 --- a/drivers/scsi/scsi_transport_iscsi.c +++ b/drivers/scsi/scsi_transport_iscsi.c @@ -680,8 +680,7 @@ iscsi_if_send_reply(int pid, int seq, int type, int done, int multi, } static int -iscsi_if_get_stats(struct iscsi_transport *transport, struct sk_buff *skb, - struct nlmsghdr *nlh) +iscsi_if_get_stats(struct iscsi_transport *transport, struct nlmsghdr *nlh) { struct iscsi_uevent *ev = NLMSG_DATA(nlh); struct iscsi_stats *stats; @@ -732,7 +731,7 @@ iscsi_if_get_stats(struct iscsi_transport *transport, struct sk_buff *skb, stats->custom_length); actual_size -= sizeof(*nlhstat); actual_size = NLMSG_LENGTH(actual_size); - skb_trim(skb, NLMSG_ALIGN(actual_size)); + skb_trim(skbstat, NLMSG_ALIGN(actual_size)); nlhstat->nlmsg_len = actual_size; err = iscsi_unicast_skb(conn->z_pdu, skbstat); @@ -923,7 +922,7 @@ iscsi_if_recv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) err = -EINVAL; break; case ISCSI_UEVENT_GET_STATS: - err = iscsi_if_get_stats(transport, skb, nlh); + err = iscsi_if_get_stats(transport, nlh); break; default: err = -EINVAL; |