Merge branch 'i2c/for-4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...

[sfrench/cifs-2.6.git] / include / rdma / ib_addr.h

diff --git a/include/rdma/ib_addr.h b/include/rdma/ib_addr.h
index 18c564f60e9389a1916d6327ae781a4e85fb8331..d656809f1217ae039abb54df1748ae3aead1dafa 100644 (file)
--- a/include/rdma/ib_addr.h
+++ b/include/rdma/ib_addr.h
@@ -94,7 +94,7 @@ struct rdma_dev_addr {
  * The dev_addr->net field must be initialized.
  */
 int rdma_translate_ip(const struct sockaddr *addr,
-                     struct rdma_dev_addr *dev_addr, u16 *vlan_id);
+                     struct rdma_dev_addr *dev_addr);
 
 /**
  * rdma_resolve_ip - Resolve source and destination IP addresses to
@@ -131,10 +131,9 @@ void rdma_copy_addr(struct rdma_dev_addr *dev_addr,
 
 int rdma_addr_size(struct sockaddr *addr);
 
-int rdma_addr_find_smac_by_sgid(union ib_gid *sgid, u8 *smac, u16 *vlan_id);
 int rdma_addr_find_l2_eth_by_grh(const union ib_gid *sgid,
                                 const union ib_gid *dgid,
-                                u8 *smac, u16 *vlan_id, int *if_index,
+                                u8 *dmac, const struct net_device *ndev,
                                 int *hoplimit);
 
 static inline u16 ib_addr_get_pkey(struct rdma_dev_addr *dev_addr)
@@ -198,34 +197,15 @@ static inline void rdma_gid2ip(struct sockaddr *out, const union ib_gid *gid)
        }
 }
 
-static inline void iboe_addr_get_sgid(struct rdma_dev_addr *dev_addr,
-                                     union ib_gid *gid)
-{
-       struct net_device *dev;
-       struct in_device *ip4;
-
-       dev = dev_get_by_index(&init_net, dev_addr->bound_dev_if);
-       if (dev) {
-               ip4 = in_dev_get(dev);
-               if (ip4 && ip4->ifa_list && ip4->ifa_list->ifa_address)
-                       ipv6_addr_set_v4mapped(ip4->ifa_list->ifa_address,
-                                              (struct in6_addr *)gid);
-
-               if (ip4)
-                       in_dev_put(ip4);
-
-               dev_put(dev);
-       }
-}
-
+/*
+ * rdma_get/set_sgid/dgid() APIs are applicable to IB, and iWarp.
+ * They are not applicable to RoCE.
+ * RoCE GIDs are derived from the IP addresses.
+ */
 static inline void rdma_addr_get_sgid(struct rdma_dev_addr *dev_addr, union ib_gid *gid)
 {
-       if (dev_addr->transport == RDMA_TRANSPORT_IB &&
-           dev_addr->dev_type != ARPHRD_INFINIBAND)
-               iboe_addr_get_sgid(dev_addr, gid);
-       else
-               memcpy(gid, dev_addr->src_dev_addr +
-                      rdma_addr_gid_offset(dev_addr), sizeof *gid);
+       memcpy(gid, dev_addr->src_dev_addr + rdma_addr_gid_offset(dev_addr),
+              sizeof(*gid));
 }
 
 static inline void rdma_addr_set_sgid(struct rdma_dev_addr *dev_addr, union ib_gid *gid)