From 8839e7b605201668dc4ca600bbacebf16a3b172b Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Mon, 18 Mar 2013 20:25:26 +0000 Subject: [PATCH] --- yaml --- r: 361767 b: refs/heads/master c: 3c32869f7afe40ff7372e5bb7cd3d8b4520711bb h: refs/heads/master i: 361765: 32329719cdb7840e406e086c0990137062f466f6 361763: f0a241d1f4c48cfc940e818eb943f72472e89f81 361759: d6d5caef9bdc590072f7243c10af37f7210afb3a v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/ipath/ipath_verbs.c | 2 +- trunk/drivers/infiniband/ulp/ipoib/ipoib_cm.c | 8 ++------ 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 7797152f53a7..8e2288187d46 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1ee9e2aa7b31427303466776f455d43e5e3c9275 +refs/heads/master: 3c32869f7afe40ff7372e5bb7cd3d8b4520711bb diff --git a/trunk/drivers/infiniband/hw/ipath/ipath_verbs.c b/trunk/drivers/infiniband/hw/ipath/ipath_verbs.c index 439c35d4a669..ea93870266eb 100644 --- a/trunk/drivers/infiniband/hw/ipath/ipath_verbs.c +++ b/trunk/drivers/infiniband/hw/ipath/ipath_verbs.c @@ -620,7 +620,7 @@ void ipath_ib_rcv(struct ipath_ibdev *dev, void *rhdr, void *data, goto bail; } - opcode = be32_to_cpu(ohdr->bth[0]) >> 24; + opcode = (be32_to_cpu(ohdr->bth[0]) >> 24) & 0x7f; dev->opstats[opcode].n_bytes += tlen; dev->opstats[opcode].n_packets++; diff --git a/trunk/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/trunk/drivers/infiniband/ulp/ipoib/ipoib_cm.c index 1ef880de3a41..67b0c1d23678 100644 --- a/trunk/drivers/infiniband/ulp/ipoib/ipoib_cm.c +++ b/trunk/drivers/infiniband/ulp/ipoib/ipoib_cm.c @@ -758,13 +758,9 @@ void ipoib_cm_send(struct net_device *dev, struct sk_buff *skb, struct ipoib_cm_ if (++priv->tx_outstanding == ipoib_sendq_size) { ipoib_dbg(priv, "TX ring 0x%x full, stopping kernel net queue\n", tx->qp->qp_num); - netif_stop_queue(dev); - rc = ib_req_notify_cq(priv->send_cq, - IB_CQ_NEXT_COMP | IB_CQ_REPORT_MISSED_EVENTS); - if (rc < 0) + if (ib_req_notify_cq(priv->send_cq, IB_CQ_NEXT_COMP)) ipoib_warn(priv, "request notify on send CQ failed\n"); - else if (rc) - ipoib_send_comp_handler(priv->send_cq, dev); + netif_stop_queue(dev); } } }