8 files changed, 43 insertions, 55 deletions

diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 26b37603dcf1..1983adc19243 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -2648,8 +2648,8 @@ static int cma_connect_ib(struct rdma_id_private *id_priv,
         req.responder_resources = conn_param->responder_resources;
         req.initiator_depth = conn_param->initiator_depth;
         req.flow_control = conn_param->flow_control;
-        req.retry_count = conn_param->retry_count;
-        req.rnr_retry_count = conn_param->rnr_retry_count;
+        req.retry_count = min_t(u8, 7, conn_param->retry_count);
+        req.rnr_retry_count = min_t(u8, 7, conn_param->rnr_retry_count);
         req.remote_cm_response_timeout = CMA_CM_RESPONSE_TIMEOUT;
         req.local_cm_response_timeout = CMA_CM_RESPONSE_TIMEOUT;
         req.max_cm_retries = CMA_MAX_CM_RETRIES;
@@ -2770,7 +2770,7 @@ static int cma_accept_ib(struct rdma_id_private *id_priv,
         rep.initiator_depth = conn_param->initiator_depth;
         rep.failover_accepted = 0;
         rep.flow_control = conn_param->flow_control;
-        rep.rnr_retry_count = conn_param->rnr_retry_count;
+        rep.rnr_retry_count = min_t(u8, 7, conn_param->rnr_retry_count);
         rep.srq = id_priv->srq ? 1 : 0;
 
         ret = ib_send_cm_rep(id_priv->cm_id.ib, &rep);
diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
index 7140199f562e..748db2d3e465 100644
--- a/drivers/infiniband/hw/nes/nes.c
+++ b/drivers/infiniband/hw/nes/nes.c
@@ -79,11 +79,6 @@ int disable_mpa_crc = 0;
 module_param(disable_mpa_crc, int, 0644);
 MODULE_PARM_DESC(disable_mpa_crc, "Disable checking of MPA CRC");
 
-unsigned int send_first = 0;
-module_param(send_first, int, 0644);
-MODULE_PARM_DESC(send_first, "Send RDMA Message First on Active Connection");
-
-
 unsigned int nes_drv_opt = NES_DRV_OPT_DISABLE_INT_MOD | NES_DRV_OPT_ENABLE_PAU;
 module_param(nes_drv_opt, int, 0644);
 MODULE_PARM_DESC(nes_drv_opt, "Driver option parameters");
diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
index 0da62b904d00..5cac29e6bc1c 100644
--- a/drivers/infiniband/hw/nes/nes.h
+++ b/drivers/infiniband/hw/nes/nes.h
@@ -57,7 +57,7 @@
 #define QUEUE_DISCONNECTS
 
 #define DRV_NAME    "iw_nes"
-#define DRV_VERSION "1.5.0.0"
+#define DRV_VERSION "1.5.0.1"
 #define PFX         DRV_NAME ": "
 
 /*
@@ -172,7 +172,6 @@ extern int interrupt_mod_interval;
 extern int nes_if_count;
 extern int mpa_version;
 extern int disable_mpa_crc;
-extern unsigned int send_first;
 extern unsigned int nes_drv_opt;
 extern unsigned int nes_debug_level;
 extern unsigned int wqm_quanta;
diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
index 1dadcf388c02..cd0ecb215cca 100644
--- a/drivers/infiniband/hw/nes/nes_verbs.c
+++ b/drivers/infiniband/hw/nes/nes_verbs.c
@@ -3006,6 +3006,7 @@ int nes_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
                                         switch (nesqp->hw_iwarp_state) {
                                                 case NES_AEQE_IWARP_STATE_CLOSING:
                                                         next_iwarp_state = NES_CQP_QP_IWARP_STATE_CLOSING;
+                                                        break;
                                                 case NES_AEQE_IWARP_STATE_TERMINATE:
                                                         next_iwarp_state = NES_CQP_QP_IWARP_STATE_TERMINATE;
                                                         break;
@@ -3068,18 +3069,9 @@ int nes_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
                 }
 
                 nesqp->ibqp_state = attr->qp_state;
-                if (((nesqp->iwarp_state & NES_CQP_QP_IWARP_STATE_MASK) ==
-                                (u32)NES_CQP_QP_IWARP_STATE_RTS) &&
-                                ((next_iwarp_state & NES_CQP_QP_IWARP_STATE_MASK) >
-                                (u32)NES_CQP_QP_IWARP_STATE_RTS)) {
-                        nesqp->iwarp_state = next_iwarp_state & NES_CQP_QP_IWARP_STATE_MASK;
-                        nes_debug(NES_DBG_MOD_QP, "Change nesqp->iwarp_state=%08x\n",
-                                        nesqp->iwarp_state);
-                } else {
-                        nesqp->iwarp_state = next_iwarp_state & NES_CQP_QP_IWARP_STATE_MASK;
-                        nes_debug(NES_DBG_MOD_QP, "Change nesqp->iwarp_state=%08x\n",
-                                        nesqp->iwarp_state);
-                }
+                nesqp->iwarp_state = next_iwarp_state & NES_CQP_QP_IWARP_STATE_MASK;
+                nes_debug(NES_DBG_MOD_QP, "Change nesqp->iwarp_state=%08x\n",
+                                nesqp->iwarp_state);
         }
 
         if (attr_mask & IB_QP_ACCESS_FLAGS) {
diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h
index 196eb52f0035..07ca6fd5546b 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib.h
+++ b/drivers/infiniband/ulp/ipoib/ipoib.h
@@ -535,14 +535,14 @@ void ipoib_drain_cq(struct net_device *dev);
 void ipoib_set_ethtool_ops(struct net_device *dev);
 int ipoib_set_dev_features(struct ipoib_dev_priv *priv, struct ib_device *hca);
 
-#ifdef CONFIG_INFINIBAND_IPOIB_CM
-
 #define IPOIB_FLAGS_RC          0x80
 #define IPOIB_FLAGS_UC          0x40
 
 /* We don't support UC connections at the moment */
 #define IPOIB_CM_SUPPORTED(ha)   (ha[0] & (IPOIB_FLAGS_RC))
 
+#ifdef CONFIG_INFINIBAND_IPOIB_CM
+
 extern int ipoib_max_conn_qp;
 
 static inline int ipoib_cm_admin_enabled(struct net_device *dev)
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
index 175581cf478c..72ae63f0072d 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -1448,37 +1448,6 @@ static ssize_t show_mode(struct device *d, struct device_attribute *attr,
                 return sprintf(buf, "datagram\n");
 }
 
-int ipoib_set_mode(struct net_device *dev, const char *buf)
-{
-        struct ipoib_dev_priv *priv = netdev_priv(dev);
-
-        /* flush paths if we switch modes so that connections are restarted */
-        if (IPOIB_CM_SUPPORTED(dev->dev_addr) && !strcmp(buf, "connected\n")) {
-                set_bit(IPOIB_FLAG_ADMIN_CM, &priv->flags);
-                ipoib_warn(priv, "enabling connected mode "
-                           "will cause multicast packet drops\n");
-                netdev_update_features(dev);
-                rtnl_unlock();
-                priv->tx_wr.send_flags &= ~IB_SEND_IP_CSUM;
-
-                ipoib_flush_paths(dev);
-                rtnl_lock();
-                return 0;
-        }
-
-        if (!strcmp(buf, "datagram\n")) {
-                clear_bit(IPOIB_FLAG_ADMIN_CM, &priv->flags);
-                netdev_update_features(dev);
-                dev_set_mtu(dev, min(priv->mcast_mtu, dev->mtu));
-                rtnl_unlock();
-                ipoib_flush_paths(dev);
-                rtnl_lock();
-                return 0;
-        }
-
-        return -EINVAL;
-}
-
 static ssize_t set_mode(struct device *d, struct device_attribute *attr,
                         const char *buf, size_t count)
 {
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index d576c7aad89d..6fdc9e78da0d 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -215,6 +215,37 @@ static int ipoib_change_mtu(struct net_device *dev, int new_mtu)
         return 0;
 }
 
+int ipoib_set_mode(struct net_device *dev, const char *buf)
+{
+        struct ipoib_dev_priv *priv = netdev_priv(dev);
+
+        /* flush paths if we switch modes so that connections are restarted */
+        if (IPOIB_CM_SUPPORTED(dev->dev_addr) && !strcmp(buf, "connected\n")) {
+                set_bit(IPOIB_FLAG_ADMIN_CM, &priv->flags);
+                ipoib_warn(priv, "enabling connected mode "
+                           "will cause multicast packet drops\n");
+                netdev_update_features(dev);
+                rtnl_unlock();
+                priv->tx_wr.send_flags &= ~IB_SEND_IP_CSUM;
+
+                ipoib_flush_paths(dev);
+                rtnl_lock();
+                return 0;
+        }
+
+        if (!strcmp(buf, "datagram\n")) {
+                clear_bit(IPOIB_FLAG_ADMIN_CM, &priv->flags);
+                netdev_update_features(dev);
+                dev_set_mtu(dev, min(priv->mcast_mtu, dev->mtu));
+                rtnl_unlock();
+                ipoib_flush_paths(dev);
+                rtnl_lock();
+                return 0;
+        }
+
+        return -EINVAL;
+}
+
 static struct ipoib_path *__path_find(struct net_device *dev, void *gid)
 {
         struct ipoib_dev_priv *priv = netdev_priv(dev);
diff --git a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
index ba6506ff4abb..926c911c0ac4 100644
--- a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
+++ b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
@@ -3094,6 +3094,8 @@ int mlx4_QP_FLOW_STEERING_ATTACH_wrapper(struct mlx4_dev *dev, int slave,
                 if (validate_eth_header_mac(slave, rule_header, rlist))
                         return -EINVAL;
                 break;
+        case MLX4_NET_TRANS_RULE_ID_IB:
+                break;
         case MLX4_NET_TRANS_RULE_ID_IPV4:
         case MLX4_NET_TRANS_RULE_ID_TCP:
         case MLX4_NET_TRANS_RULE_ID_UDP: