From ea3b7248e7d67e34256bd879d19bdd397439e900 Mon Sep 17 00:00:00 2001 From: Hal Rosenstock Date: Wed, 21 Sep 2005 12:33:09 -0700 Subject: [PATCH] --- yaml --- r: 9160 b: refs/heads/master c: f2065e4242e5078d53c521b973c5cd4eae91eca2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/core/mad_rmpp.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 07527b0f6f8a..a5680d9017da 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 972d512a17c1bb7c4b784a9da2ca75745fcc6989 +refs/heads/master: f2065e4242e5078d53c521b973c5cd4eae91eca2 diff --git a/trunk/drivers/infiniband/core/mad_rmpp.c b/trunk/drivers/infiniband/core/mad_rmpp.c index 8f7cef0812f6..e23836d0e21b 100644 --- a/trunk/drivers/infiniband/core/mad_rmpp.c +++ b/trunk/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;