RDMA/cxgb4: Fix endianness of addition to mpa->private_data_size

sparse correctly warns that if mpa->private_data_size is __be16, then
doing += on it is wrong, even if we do += htons(<something>) -- on a
little endian system, carries will go the wrong way.  Fix this up by
doing the addition in native byte order.

Acked-by: Steve Wise <swise@opengridcomputing.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>

diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c
index b18870c455adde5546ec90a4bf356813bbb34432..51f42061dae9de4d375795e89e5a95b28bbc0405 100644 (file)
--- a/drivers/infiniband/hw/cxgb4/cm.c
+++ b/drivers/infiniband/hw/cxgb4/cm.c
@@ -548,8 +548,8 @@ static void send_mpa_req(struct c4iw_ep *ep, struct sk_buff *skb,
        }
 
        if (mpa_rev_to_use == 2) {
-               mpa->private_data_size +=
-                       htons(sizeof(struct mpa_v2_conn_params));
+               mpa->private_data_size = htons(ntohs(mpa->private_data_size) +
+                                              sizeof (struct mpa_v2_conn_params));
                mpa_v2_params.ird = htons((u16)ep->ird);
                mpa_v2_params.ord = htons((u16)ep->ord);
 
@@ -635,8 +635,8 @@ static int send_mpa_reject(struct c4iw_ep *ep, const void *pdata, u8 plen)
 
        if (ep->mpa_attr.version == 2 && ep->mpa_attr.enhanced_rdma_conn) {
                mpa->flags |= MPA_ENHANCED_RDMA_CONN;
-               mpa->private_data_size +=
-                       htons(sizeof(struct mpa_v2_conn_params));
+               mpa->private_data_size = htons(ntohs(mpa->private_data_size) +
+                                              sizeof (struct mpa_v2_conn_params));
                mpa_v2_params.ird = htons(((u16)ep->ird) |
                                          (peer2peer ? MPA_V2_PEER2PEER_MODEL :
                                           0));
@@ -715,8 +715,8 @@ static int send_mpa_reply(struct c4iw_ep *ep, const void *pdata, u8 plen)
 
        if (ep->mpa_attr.version == 2 && ep->mpa_attr.enhanced_rdma_conn) {
                mpa->flags |= MPA_ENHANCED_RDMA_CONN;
-               mpa->private_data_size +=
-                       htons(sizeof(struct mpa_v2_conn_params));
+               mpa->private_data_size = htons(ntohs(mpa->private_data_size) +
+                                              sizeof (struct mpa_v2_conn_params));
                mpa_v2_params.ird = htons((u16)ep->ird);
                mpa_v2_params.ord = htons((u16)ep->ord);
                if (peer2peer && (ep->mpa_attr.p2p_type !=