From: Hal Rosenstock Date: Wed, 21 Sep 2005 19:33:09 +0000 (-0700) Subject: [IB] Fix RMPP receive length calculation X-Git-Tag: v2.6.14-rc3~129^2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f2065e4242e5078d53c521b973c5cd4eae91eca2;p=linux-2.6-omap-h63xx.git [IB] Fix RMPP receive length calculation Based on simplification idea from Sean Hefty Signed-off-by: Hal Rosenstock Signed-off-by: Roland Dreier --- diff --git a/drivers/infiniband/core/mad_rmpp.c b/drivers/infiniband/core/mad_rmpp.c index 8f7cef0812f..e23836d0e21 100644 --- a/drivers/infiniband/core/mad_rmpp.c +++ b/drivers/infiniband/core/mad_rmpp.c @@ -412,8 +412,8 @@ static inline int get_mad_len(struct mad_rmpp_recv *rmpp_recv) hdr_size = data_offset(rmpp_mad->mad_hdr.mgmt_class); data_size = sizeof(struct ib_rmpp_mad) - hdr_size; - pad = data_size - be32_to_cpu(rmpp_mad->rmpp_hdr.paylen_newwin); - if (pad > data_size || pad < 0) + pad = IB_MGMT_RMPP_DATA - be32_to_cpu(rmpp_mad->rmpp_hdr.paylen_newwin); + if (pad > IB_MGMT_RMPP_DATA || pad < 0) pad = 0; return hdr_size + rmpp_recv->seg_num * data_size - pad;