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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IB/iser: Add dependency on INFINIBAND_ADDR_TRANS
  IPoIB: Do not join broadcast group if interface is brought down
  RDMA/nes: Fix for NIPQUAD removal
  IPoIB: Fix loss of connectivity after bonding failover on both sides
  IB/mlx4: Don't register IB device for adapters with no IB ports
  mlx4_core: Fix warning from min()
  IB/ehca: spin_lock_irqsave() takes an unsigned long

diff --combined drivers/infiniband/hw/nes/nes_cm.c
index 6ba57e91d7ab742288208649cd707a845e672572,ca9ef3fbd33877b28ae220bfb773527c8f53c53a..a01b4488208b20c97a8b0317ecc0b3777a3d5577
--- 1/drivers/infiniband/hw/nes/nes_cm.c
--- 2/drivers/infiniband/hw/nes/nes_cm.c
+++ b/drivers/infiniband/hw/nes/nes_cm.c
@@@ -778,12 -778,13 +778,13 @@@ static struct nes_cm_node *find_node(st
        unsigned long flags;
        struct list_head *hte;
        struct nes_cm_node *cm_node;
+       __be32 tmp_addr = cpu_to_be32(loc_addr);
  
        /* get a handle on the hte */
        hte = &cm_core->connected_nodes;
  
        nes_debug(NES_DBG_CM, "Searching for an owner node: %pI4:%x from core %p->%p\n",
-                 &loc_addr, loc_port, cm_core, hte);
+                 &tmp_addr, loc_port, cm_core, hte);
  
        /* walk list and find cm_node associated with this session ID */
        spin_lock_irqsave(&cm_core->ht_lock, flags);
@@@ -816,6 -817,7 +817,7 @@@ static struct nes_cm_listener *find_lis
  {
        unsigned long flags;
        struct nes_cm_listener *listen_node;
+       __be32 tmp_addr = cpu_to_be32(dst_addr);
  
        /* walk list and find cm_node associated with this session ID */
        spin_lock_irqsave(&cm_core->listen_list_lock, flags);
@@@ -833,7 -835,7 +835,7 @@@
        spin_unlock_irqrestore(&cm_core->listen_list_lock, flags);
  
        nes_debug(NES_DBG_CM, "Unable to find listener for %pI4:%x\n",
-                 &dst_addr, dst_port);
+                 &tmp_addr, dst_port);
  
        /* no listener */
        return NULL;
@@@ -2059,6 -2061,7 +2061,7 @@@ static int mini_cm_recv_pkt(struct nes_
        struct tcphdr *tcph;
        struct nes_cm_info nfo;
        int skb_handled = 1;
+       __be32 tmp_daddr, tmp_saddr;
  
        if (!skb)
                return 0;
@@@ -2074,8 -2077,11 +2077,11 @@@
        nfo.rem_addr = ntohl(iph->saddr);
        nfo.rem_port = ntohs(tcph->source);
  
+       tmp_daddr = cpu_to_be32(iph->daddr);
+       tmp_saddr = cpu_to_be32(iph->saddr);
+ 
        nes_debug(NES_DBG_CM, "Received packet: dest=%pI4:0x%04X src=%pI4:0x%04X\n",
-                 &iph->daddr, tcph->dest, &iph->saddr, tcph->source);
+                 &tmp_daddr, tcph->dest, &tmp_saddr, tcph->source);
  
        do {
                cm_node = find_node(cm_core,
@@@ -2705,7 -2711,7 +2711,7 @@@ int nes_accept(struct iw_cm_id *cm_id, 
                        sizeof(struct ietf_mpa_frame));
  
  
 -      /* notify OF layer that accept event was successfull */
 +      /* notify OF layer that accept event was successful */
        cm_id->add_ref(cm_id);
  
        cm_event.event = IW_CM_EVENT_ESTABLISHED;