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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (63 commits)
  IB/qib: clean up properly if pci_set_consistent_dma_mask() fails
  IB/qib: Allow driver to load if PCIe AER fails
  IB/qib: Fix uninitialized pointer if CONFIG_PCI_MSI not set
  IB/qib: Fix extra log level in qib_early_err()
  RDMA/cxgb4: Remove unnecessary KERN_<level> use
  RDMA/cxgb3: Remove unnecessary KERN_<level> use
  IB/core: Add link layer type information to sysfs
  IB/mlx4: Add VLAN support for IBoE
  IB/core: Add VLAN support for IBoE
  IB/mlx4: Add support for IBoE
  mlx4_en: Change multicast promiscuous mode to support IBoE
  mlx4_core: Update data structures and constants for IBoE
  mlx4_core: Allow protocol drivers to find corresponding interfaces
  IB/uverbs: Return link layer type to userspace for query port operation
  IB/srp: Sync buffer before posting send
  IB/srp: Use list_first_entry()
  IB/srp: Reduce number of BUSY conditions
  IB/srp: Eliminate two forward declarations
  IB/mlx4: Signal node desc changes to SM by using FW to generate trap 144
  IB: Replace EXTRA_CFLAGS with ccflags-y
  ...

3 files changed, 11 insertions, 9 deletions

diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
index 6220d9d75b58..25ad0f9944c0 100644
--- a/drivers/infiniband/hw/nes/nes_cm.c
+++ b/drivers/infiniband/hw/nes/nes_cm.c
@@ -1424,7 +1424,6 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
 {
 
         int     reset = 0;      /* whether to send reset in case of err.. */
-        int     passive_state;
         atomic_inc(&cm_resets_recvd);
         nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u."
                         " refcnt=%d\n", cm_node, cm_node->state,
@@ -1439,7 +1438,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
                 active_open_err(cm_node, skb, reset);
                 break;
         case NES_CM_STATE_MPAREQ_RCVD:
-                passive_state = atomic_add_return(1, &cm_node->passive_state);
+                atomic_inc(&cm_node->passive_state);
                 dev_kfree_skb_any(skb);
                 break;
         case NES_CM_STATE_ESTABLISHED:
diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
index 10560c796fd6..3892e2c0e95a 100644
--- a/drivers/infiniband/hw/nes/nes_nic.c
+++ b/drivers/infiniband/hw/nes/nes_nic.c
@@ -271,6 +271,7 @@ static int nes_netdev_stop(struct net_device *netdev)
 
         if (netif_msg_ifdown(nesvnic))
                 printk(KERN_INFO PFX "%s: disabling interface\n", netdev->name);
+        netif_carrier_off(netdev);
 
         /* Disable network packets */
         napi_disable(&nesvnic->napi);
diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
index 546fc22405fe..99933e4e48ff 100644
--- a/drivers/infiniband/hw/nes/nes_verbs.c
+++ b/drivers/infiniband/hw/nes/nes_verbs.c
@@ -476,9 +476,9 @@ static struct ib_fast_reg_page_list *nes_alloc_fast_reg_page_list(
         }
         nes_debug(NES_DBG_MR, "nes_alloc_fast_reg_pbl: nes_frpl = %p, "
                   "ibfrpl = %p, ibfrpl.page_list = %p, pbl.kva = %p, "
-                  "pbl.paddr= %p\n", pnesfrpl, &pnesfrpl->ibfrpl,
+                  "pbl.paddr = %llx\n", pnesfrpl, &pnesfrpl->ibfrpl,
                   pnesfrpl->ibfrpl.page_list, pnesfrpl->nes_wqe_pbl.kva,
-                  (void *)pnesfrpl->nes_wqe_pbl.paddr);
+                  (unsigned long long) pnesfrpl->nes_wqe_pbl.paddr);
 
         return pifrpl;
 }
@@ -584,7 +584,9 @@ static int nes_query_port(struct ib_device *ibdev, u8 port, struct ib_port_attr
         props->lmc = 0;
         props->sm_lid = 0;
         props->sm_sl = 0;
-        if (nesvnic->linkup)
+        if (netif_queue_stopped(netdev))
+                props->state = IB_PORT_DOWN;
+        else if (nesvnic->linkup)
                 props->state = IB_PORT_ACTIVE;
         else
                 props->state = IB_PORT_DOWN;
@@ -3483,13 +3485,13 @@ static int nes_post_send(struct ib_qp *ibqp, struct ib_send_wr *ib_wr,
                         for (i = 0; i < ib_wr->wr.fast_reg.page_list_len; i++)
                                 dst_page_list[i] = cpu_to_le64(src_page_list[i]);
 
-                        nes_debug(NES_DBG_IW_TX, "SQ_FMR: iova_start: %p, "
-                                  "length: %d, rkey: %0x, pgl_paddr: %p, "
+                        nes_debug(NES_DBG_IW_TX, "SQ_FMR: iova_start: %llx, "
+                                  "length: %d, rkey: %0x, pgl_paddr: %llx, "
                                   "page_list_len: %u, wqe_misc: %x\n",
-                                  (void *)ib_wr->wr.fast_reg.iova_start,
+                                  (unsigned long long) ib_wr->wr.fast_reg.iova_start,
                                   ib_wr->wr.fast_reg.length,
                                   ib_wr->wr.fast_reg.rkey,
-                                  (void *)pnesfrpl->nes_wqe_pbl.paddr,
+                                  (unsigned long long) pnesfrpl->nes_wqe_pbl.paddr,
                                   ib_wr->wr.fast_reg.page_list_len,
                                   wqe_misc);
                         break;