4 files changed, 17 insertions, 7 deletions

diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c
index 58463da814d1..e351b1548535 100644
--- a/drivers/infiniband/core/mad.c
+++ b/drivers/infiniband/core/mad.c
@@ -2953,6 +2953,9 @@ static void ib_mad_remove_device(struct ib_device *device)
 {
         int i, num_ports, cur_port;
 
+        if (rdma_node_get_transport(device->node_type) != RDMA_TRANSPORT_IB)
+                return;
+
         if (device->node_type == RDMA_NODE_IB_SWITCH) {
                 num_ports = 1;
                 cur_port = 0;
diff --git a/drivers/infiniband/hw/cxgb3/iwch.c b/drivers/infiniband/hw/cxgb3/iwch.c
index ee1d8b4d4541..63f975f3e30f 100644
--- a/drivers/infiniband/hw/cxgb3/iwch.c
+++ b/drivers/infiniband/hw/cxgb3/iwch.c
@@ -189,6 +189,7 @@ static void close_rnic_dev(struct t3cdev *tdev)
         list_for_each_entry_safe(dev, tmp, &dev_list, entry) {
                 if (dev->rdev.t3cdev_p == tdev) {
                         dev->rdev.flags = CXIO_ERROR_FATAL;
+                        synchronize_net();
                         cancel_delayed_work_sync(&dev->db_drop_task);
                         list_del(&dev->entry);
                         iwch_unregister_device(dev);
@@ -217,6 +218,7 @@ static void iwch_event_handler(struct t3cdev *tdev, u32 evt, u32 port_id)
         switch (evt) {
         case OFFLOAD_STATUS_DOWN: {
                 rdev->flags = CXIO_ERROR_FATAL;
+                synchronize_net();
                 event.event  = IB_EVENT_DEVICE_FATAL;
                 dispatch = 1;
                 break;
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
index 83a7751c38d6..bc658373ad55 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -708,6 +708,7 @@ void ipoib_cm_send(struct net_device *dev, struct sk_buff *skb, struct ipoib_cm_
         struct ipoib_dev_priv *priv = netdev_priv(dev);
         struct ipoib_cm_tx_buf *tx_req;
         u64 addr;
+        int rc;
 
         if (unlikely(skb->len > tx->mtu)) {
                 ipoib_warn(priv, "packet len %d (> %d) too long to send, dropping\n",
@@ -739,9 +740,10 @@ void ipoib_cm_send(struct net_device *dev, struct sk_buff *skb, struct ipoib_cm_
 
         tx_req->mapping = addr;
 
-        if (unlikely(post_send(priv, tx, tx->tx_head & (ipoib_sendq_size - 1),
-                               addr, skb->len))) {
-                ipoib_warn(priv, "post_send failed\n");
+        rc = post_send(priv, tx, tx->tx_head & (ipoib_sendq_size - 1),
+                       addr, skb->len);
+        if (unlikely(rc)) {
+                ipoib_warn(priv, "post_send failed, error %d\n", rc);
                 ++dev->stats.tx_errors;
                 ib_dma_unmap_single(priv->ca, addr, skb->len, DMA_TO_DEVICE);
                 dev_kfree_skb_any(skb);
@@ -752,6 +754,8 @@ 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);
+                        if (ib_req_notify_cq(priv->send_cq, IB_CQ_NEXT_COMP))
+                                ipoib_warn(priv, "request notify on send CQ failed\n");
                         netif_stop_queue(dev);
                 }
         }
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
index 8c91d9f37ada..5df40b128f81 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
@@ -529,7 +529,7 @@ void ipoib_send(struct net_device *dev, struct sk_buff *skb,
 {
         struct ipoib_dev_priv *priv = netdev_priv(dev);
         struct ipoib_tx_buf *tx_req;
-        int hlen;
+        int hlen, rc;
         void *phead;
 
         if (skb_is_gso(skb)) {
@@ -585,9 +585,10 @@ void ipoib_send(struct net_device *dev, struct sk_buff *skb,
                 netif_stop_queue(dev);
         }
 
-        if (unlikely(post_send(priv, priv->tx_head & (ipoib_sendq_size - 1),
-                               address->ah, qpn, tx_req, phead, hlen))) {
-                ipoib_warn(priv, "post_send failed\n");
+        rc = post_send(priv, priv->tx_head & (ipoib_sendq_size - 1),
+                       address->ah, qpn, tx_req, phead, hlen);
+        if (unlikely(rc)) {
+                ipoib_warn(priv, "post_send failed, error %d\n", rc);
                 ++dev->stats.tx_errors;
                 --priv->tx_outstanding;
                 ipoib_dma_unmap_tx(priv->ca, tx_req);