Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[linux-drm-fsl-dcu.git] / drivers / infiniband / ulp / ipoib / ipoib_ib.c

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
index ba0ee5cf2ad75cf4ea89b2f754dc6e98cf314572..1bdb9101911ae779285693f38a39304bd1bcbba0 100644 (file)
--- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
@@ -172,8 +172,8 @@ static void ipoib_ib_handle_rx_wc(struct net_device *dev, struct ib_wc *wc)
        struct sk_buff *skb;
        u64 addr;
 
-       ipoib_dbg_data(priv, "recv completion: id %d, op %d, status: %d\n",
-                      wr_id, wc->opcode, wc->status);
+       ipoib_dbg_data(priv, "recv completion: id %d, status: %d\n",
+                      wr_id, wc->status);
 
        if (unlikely(wr_id >= ipoib_recvq_size)) {
                ipoib_warn(priv, "recv completion event with wrid %d (> %d)\n",
@@ -216,7 +216,7 @@ static void ipoib_ib_handle_rx_wc(struct net_device *dev, struct ib_wc *wc)
        if (wc->slid != priv->local_lid ||
            wc->src_qp != priv->qp->qp_num) {
                skb->protocol = ((struct ipoib_header *) skb->data)->proto;
-               skb->mac.raw = skb->data;
+               skb_reset_mac_header(skb);
                skb_pull(skb, IPOIB_ENCAP_LEN);
 
                dev->last_rx = jiffies;
@@ -245,8 +245,8 @@ static void ipoib_ib_handle_tx_wc(struct net_device *dev, struct ib_wc *wc)
        struct ipoib_tx_buf *tx_req;
        unsigned long flags;
 
-       ipoib_dbg_data(priv, "send completion: id %d, op %d, status: %d\n",
-                      wr_id, wc->opcode, wc->status);
+       ipoib_dbg_data(priv, "send completion: id %d, status: %d\n",
+                      wr_id, wc->status);
 
        if (unlikely(wr_id >= ipoib_sendq_size)) {
                ipoib_warn(priv, "send completion event with wrid %d (> %d)\n",