RDMA/core: Rename rdma_copy_addr to rdma_copy_src_l2_addr

Now that rdma_copy_addr() only copies the source addresses and all callers
are interested in copying only source addresses, simplify it to drop the
destination address argument.

Given that it only copies source layer2 addresses, rename it to
rdma_copy_src_l2_addr for better code readability.

Signed-off-by: Parav Pandit <parav@mellanox.com>
Reviewed-by: Daniel Jurgens <danielj@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
index 40f1c15634773624d1f881455ba87aacc4acfc92..c9d14d6996b2bf99f537eb9b57bd8f5e18c14433 100644 (file)
--- a/drivers/infiniband/core/addr.c
+++ b/drivers/infiniband/core/addr.c
@@ -219,18 +219,24 @@ int rdma_addr_size_kss(struct __kernel_sockaddr_storage *addr)
 }
 EXPORT_SYMBOL(rdma_addr_size_kss);
 
-void rdma_copy_addr(struct rdma_dev_addr *dev_addr,
-                   const struct net_device *dev,
-                   const unsigned char *dst_dev_addr)
+/**
+ * rdma_copy_src_l2_addr - Copy netdevice source addresses
+ * @dev_addr:  Destination address pointer where to copy the addresses
+ * @dev:       Netdevice whose source addresses to copy
+ *
+ * rdma_copy_src_l2_addr() copies source addresses from the specified netdevice.
+ * This includes unicast address, broadcast address, device type and
+ * interface index.
+ */
+void rdma_copy_src_l2_addr(struct rdma_dev_addr *dev_addr,
+                          const struct net_device *dev)
 {
        dev_addr->dev_type = dev->type;
        memcpy(dev_addr->src_dev_addr, dev->dev_addr, MAX_ADDR_LEN);
        memcpy(dev_addr->broadcast, dev->broadcast, MAX_ADDR_LEN);
-       if (dst_dev_addr)
-               memcpy(dev_addr->dst_dev_addr, dst_dev_addr, MAX_ADDR_LEN);
        dev_addr->bound_dev_if = dev->ifindex;
 }
-EXPORT_SYMBOL(rdma_copy_addr);
+EXPORT_SYMBOL(rdma_copy_src_l2_addr);
 
 static struct net_device *
 rdma_find_ndev_for_src_ip_rcu(struct net *net, const struct sockaddr *src_in)
@@ -271,7 +277,7 @@ int rdma_translate_ip(const struct sockaddr *addr,
                dev = dev_get_by_index(dev_addr->net, dev_addr->bound_dev_if);
                if (!dev)
                        return -ENODEV;
-               rdma_copy_addr(dev_addr, dev, NULL);
+               rdma_copy_src_l2_addr(dev_addr, dev);
                dev_put(dev);
                return 0;
        }
@@ -279,7 +285,7 @@ int rdma_translate_ip(const struct sockaddr *addr,
        rcu_read_lock();
        dev = rdma_find_ndev_for_src_ip_rcu(dev_addr->net, addr);
        if (!IS_ERR(dev))
-               rdma_copy_addr(dev_addr, dev, NULL);
+               rdma_copy_src_l2_addr(dev_addr, dev);
        rcu_read_unlock();
        return PTR_ERR_OR_ZERO(dev);
 }
@@ -484,7 +490,7 @@ static int rdma_set_src_addr(const struct dst_entry *dst,
        if (dst->dev->flags & IFF_LOOPBACK)
                ret = rdma_translate_ip(dst_in, dev_addr);
        else
-               rdma_copy_addr(dev_addr, dst->dev, NULL);
+               rdma_copy_src_l2_addr(dev_addr, dst->dev);
        return ret;
 }
 

diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 4ba77f4e7098c8eea4cb610386d833ab8ac319eb..ace2a4c757f6878a3c1daeec07bf7a25a71e7439 100644 (file)
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -1900,7 +1900,7 @@ cma_ib_new_conn_id(const struct rdma_cm_id *listen_id,
                rt->path_rec[1] = *ib_event->param.req_rcvd.alternate_path;
 
        if (net_dev) {
-               rdma_copy_addr(&rt->addr.dev_addr, net_dev, NULL);
+               rdma_copy_src_l2_addr(&rt->addr.dev_addr, net_dev);
        } else {
                if (!cma_protocol_roce(listen_id) &&
                    cma_any_addr(cma_src_addr(id_priv))) {
@@ -1950,7 +1950,7 @@ cma_ib_new_udp_id(const struct rdma_cm_id *listen_id,
                goto err;
 
        if (net_dev) {
-               rdma_copy_addr(&id->route.addr.dev_addr, net_dev, NULL);
+               rdma_copy_src_l2_addr(&id->route.addr.dev_addr, net_dev);
        } else {
                if (!cma_any_addr(cma_src_addr(id_priv))) {
                        ret = cma_translate_addr(cma_src_addr(id_priv),

diff --git a/drivers/infiniband/core/core_priv.h b/drivers/infiniband/core/core_priv.h
index 77c7005c396c53feb243c423ba989c9095001277..c3d93350413ce5055aa1976500305f4379ad1721 100644 (file)
--- a/drivers/infiniband/core/core_priv.h
+++ b/drivers/infiniband/core/core_priv.h
@@ -340,5 +340,7 @@ 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);
+void rdma_copy_src_l2_addr(struct rdma_dev_addr *dev_addr,
+                          const struct net_device *dev);
 
 #endif /* _CORE_PRIV_H */

diff --git a/include/rdma/ib_addr.h b/include/rdma/ib_addr.h
index 77c7908b7d73f28683d7ce993e1011822b948eb5..676514a930abc8432ce5c970edbd175c3c6a762a 100644 (file)
--- a/include/rdma/ib_addr.h
+++ b/include/rdma/ib_addr.h
@@ -105,10 +105,6 @@ int rdma_resolve_ip(struct sockaddr *src_addr, const struct sockaddr *dst_addr,
 
 void rdma_addr_cancel(struct rdma_dev_addr *addr);
 
-void rdma_copy_addr(struct rdma_dev_addr *dev_addr,
-                   const struct net_device *dev,
-                   const unsigned char *dst_dev_addr);
-
 int rdma_addr_size(const struct sockaddr *addr);
 int rdma_addr_size_in6(struct sockaddr_in6 *addr);
 int rdma_addr_size_kss(struct __kernel_sockaddr_storage *addr);