1 files changed, 9 insertions, 0 deletions

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
index 08c4396cf41..d13f4fb3853 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
@@ -231,6 +231,10 @@ static void ipoib_ib_handle_rx_wc(struct net_device *dev, struct ib_wc *wc)
         skb->dev = dev;
         /* XXX get correct PACKET_ type here */
         skb->pkt_type = PACKET_HOST;
+
+        if (test_bit(IPOIB_FLAG_CSUM, &priv->flags) && likely(wc->csum_ok))
+                skb->ip_summed = CHECKSUM_UNNECESSARY;
+
         netif_receive_skb(skb);
 
 repost:
@@ -442,6 +446,11 @@ void ipoib_send(struct net_device *dev, struct sk_buff *skb,
                 return;
         }
 
+        if (skb->ip_summed == CHECKSUM_PARTIAL)
+                priv->tx_wr.send_flags |= IB_SEND_IP_CSUM;
+        else
+                priv->tx_wr.send_flags &= ~IB_SEND_IP_CSUM;
+
         if (unlikely(post_send(priv, priv->tx_head & (ipoib_sendq_size - 1),
                                address->ah, qpn,
                                tx_req->mapping, skb_headlen(skb),