diff options
author | Hal Rosenstock <halr@voltaire.com> | 2005-09-19 16:51:01 -0400 |
---|---|---|
committer | Roland Dreier <rolandd@cisco.com> | 2005-09-19 16:51:01 -0400 |
commit | eff4c654b1a4a5e5493fbdc3affa6dd48765c085 (patch) | |
tree | 1ddbbdaa978b310f5ac11b9778ac8e5f775d0783 | |
parent | 6577ae51cf52f5fb0e4a85e673dd7bf2d0074e3e (diff) |
[PATCH] IB: Fix data length for RMPP SA sends
We need to subtract off the header length from our payload
length when sending multi-packet SA messages.
Signed-off-by: Hal Rosenstock <halr@voltaire.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
-rw-r--r-- | drivers/infiniband/core/user_mad.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c index 7c2f03057ddb..a64d6b4dcc16 100644 --- a/drivers/infiniband/core/user_mad.c +++ b/drivers/infiniband/core/user_mad.c | |||
@@ -334,10 +334,11 @@ static ssize_t ib_umad_write(struct file *filp, const char __user *buf, | |||
334 | ret = -EINVAL; | 334 | ret = -EINVAL; |
335 | goto err_ah; | 335 | goto err_ah; |
336 | } | 336 | } |
337 | /* Validate that management class can support RMPP */ | 337 | |
338 | /* Validate that the management class can support RMPP */ | ||
338 | if (rmpp_mad->mad_hdr.mgmt_class == IB_MGMT_CLASS_SUBN_ADM) { | 339 | if (rmpp_mad->mad_hdr.mgmt_class == IB_MGMT_CLASS_SUBN_ADM) { |
339 | hdr_len = offsetof(struct ib_sa_mad, data); | 340 | hdr_len = offsetof(struct ib_sa_mad, data); |
340 | data_len = length; | 341 | data_len = length - hdr_len; |
341 | } else if ((rmpp_mad->mad_hdr.mgmt_class >= IB_MGMT_CLASS_VENDOR_RANGE2_START) && | 342 | } else if ((rmpp_mad->mad_hdr.mgmt_class >= IB_MGMT_CLASS_VENDOR_RANGE2_START) && |
342 | (rmpp_mad->mad_hdr.mgmt_class <= IB_MGMT_CLASS_VENDOR_RANGE2_END)) { | 343 | (rmpp_mad->mad_hdr.mgmt_class <= IB_MGMT_CLASS_VENDOR_RANGE2_END)) { |
343 | hdr_len = offsetof(struct ib_vendor_mad, data); | 344 | hdr_len = offsetof(struct ib_vendor_mad, data); |