Browse Source

IB/core: Move rdma_addr_find_l2_eth_by_grh to core_priv.h

Before commit [1], rdma_addr_find_l2_eth_by_grh() was an exported function
and therefore declaration in include/rdma/ib_addr.h was fine.

But now that its scope is limited to ib_core module, its better to have it
in core_priv.h.

[1] commit 1060f8653414 ("IB/{core/cm}: Fix generating a return AH for
RoCEE")

Reviewed-by: Daniel Jurgens <danielj@mellanox.com>
Signed-off-by: Parav Pandit <parav@mellanox.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Parav Pandit 7 years ago
parent
commit
e41a7c4194
2 changed files with 5 additions and 5 deletions
  1. 5 0
      drivers/infiniband/core/core_priv.h
  2. 0 5
      include/rdma/ib_addr.h

+ 5 - 0
drivers/infiniband/core/core_priv.h

@@ -339,4 +339,9 @@ int rdma_resolve_ip_route(struct sockaddr *src_addr,
 			  const struct sockaddr *dst_addr,
 			  const struct sockaddr *dst_addr,
 			  struct rdma_dev_addr *addr);
 			  struct rdma_dev_addr *addr);
 
 
+int rdma_addr_find_l2_eth_by_grh(const union ib_gid *sgid,
+				 const union ib_gid *dgid,
+				 u8 *dmac, const struct net_device *ndev,
+				 int *hoplimit);
+
 #endif /* _CORE_PRIV_H */
 #endif /* _CORE_PRIV_H */

+ 0 - 5
include/rdma/ib_addr.h

@@ -127,11 +127,6 @@ void rdma_copy_addr(struct rdma_dev_addr *dev_addr,
 
 
 int rdma_addr_size(struct sockaddr *addr);
 int rdma_addr_size(struct sockaddr *addr);
 
 
-int rdma_addr_find_l2_eth_by_grh(const union ib_gid *sgid,
-				 const union ib_gid *dgid,
-				 u8 *dmac, const struct net_device *ndev,
-				 int *hoplimit);
-
 static inline u16 ib_addr_get_pkey(struct rdma_dev_addr *dev_addr)
 static inline u16 ib_addr_get_pkey(struct rdma_dev_addr *dev_addr)
 {
 {
 	return ((u16)dev_addr->broadcast[8] << 8) | (u16)dev_addr->broadcast[9];
 	return ((u16)dev_addr->broadcast[8] << 8) | (u16)dev_addr->broadcast[9];