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: (81 commits)
  RDMA/cxgb3: Fix the T3A workaround checks
  IB/ipath: Remove unnecessary cast
  IPoIB: Constify seq_operations function pointer tables
  RDMA/cxgb3: Mark QP as privileged based on user capabilities
  RDMA/cxgb3: Fix page shift calculation in build_phys_page_list()
  RDMA/cxgb3: Flush the receive queue when closing
  IB/ipath: Trivial simplification of ipath_make_ud_req()
  IB/mthca: Update latest "native Arbel" firmware revision
  IPoIB: Remove redundant check of netif_queue_stopped() in xmit handler
  IB/ipath: Add mappings from HW register to PortInfo port physical state
  IB/ipath: Changes to support PIO bandwidth check on IBA7220
  IB/ipath: Minor cleanup of unused fields and chip-specific errors
  IB/ipath: New sysfs entries to control 7220 features
  IB/ipath: Add new chip-specific functions to older chips, consistent init
  IB/ipath: Remove unused MDIO interface code
  IB/ehca: Prevent RDMA-related connection failures on some eHCA2 hardware
  IB/ehca: Add "port connection autodetect mode"
  IB/ehca: Define array to store SMI/GSI QPs
  IB/ehca: Remove CQ-QP-link before destroying QP in error path of create_qp()
  IB/iser: Add change_queue_depth method
  ...

2 files changed, 13 insertions, 8 deletions

diff --git a/include/net/if_inet6.h b/include/net/if_inet6.h
index 448eccb20638..b24508abb850 100644
--- a/include/net/if_inet6.h
+++ b/include/net/if_inet6.h
@@ -269,18 +269,21 @@ static inline void ipv6_arcnet_mc_map(const struct in6_addr *addr, char *buf)
         buf[0] = 0x00;
 }
 
-static inline void ipv6_ib_mc_map(struct in6_addr *addr, char *buf)
+static inline void ipv6_ib_mc_map(const struct in6_addr *addr,
+                                  const unsigned char *broadcast, char *buf)
 {
+        unsigned char scope = broadcast[5] & 0xF;
+
         buf[0]  = 0;            /* Reserved */
         buf[1]  = 0xff;         /* Multicast QPN */
         buf[2]  = 0xff;
         buf[3]  = 0xff;
         buf[4]  = 0xff;
-        buf[5]  = 0x12;         /* link local scope */
+        buf[5]  = 0x10 | scope; /* scope from broadcast address */
         buf[6]  = 0x60;         /* IPv6 signature */
         buf[7]  = 0x1b;
-        buf[8]  = 0;            /* P_Key */
-        buf[9]  = 0;
+        buf[8]  = broadcast[8]; /* P_Key */
+        buf[9]  = broadcast[9];
         memcpy(buf + 10, addr->s6_addr + 6, 10);
 }
 #endif
diff --git a/include/net/ip.h b/include/net/ip.h
index 840dd91b513b..50c8889b1b8d 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -266,20 +266,22 @@ static inline void ip_eth_mc_map(__be32 naddr, char *buf)
  *      Leave P_Key as 0 to be filled in by driver.
  */
 
-static inline void ip_ib_mc_map(__be32 naddr, char *buf)
+static inline void ip_ib_mc_map(__be32 naddr, const unsigned char *broadcast, char *buf)
 {
         __u32 addr;
+        unsigned char scope = broadcast[5] & 0xF;
+
         buf[0]  = 0;            /* Reserved */
         buf[1]  = 0xff;         /* Multicast QPN */
         buf[2]  = 0xff;
         buf[3]  = 0xff;
         addr    = ntohl(naddr);
         buf[4]  = 0xff;
-        buf[5]  = 0x12;         /* link local scope */
+        buf[5]  = 0x10 | scope; /* scope from broadcast address */
         buf[6]  = 0x40;         /* IPv4 signature */
         buf[7]  = 0x1b;
-        buf[8]  = 0;            /* P_Key */
-        buf[9]  = 0;
+        buf[8]  = broadcast[8];         /* P_Key */
+        buf[9]  = broadcast[9];
         buf[10] = 0;
         buf[11] = 0;
         buf[12] = 0;