IB/addr: Store net_device type instead of translating to RDMA transport

The struct rdma_dev_addr stores net_device address information:
the source device address, destination hardware address, and
broadcast address.  For consistency, store the net_device type
rather than converting it to the rdma_node_type.

The type indicates the format of the various hardware addresses,
which is what we're concerned with, and not the RDMA node type
that the address may map to.

Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
index b59ba7ccef0e1a8a86c6a2f8f176aa353e93920e..de5fe161a1b9bf7838b4a538a67ed2cdbc915b0e 100644 (file)
--- a/drivers/infiniband/core/addr.c
+++ b/drivers/infiniband/core/addr.c
@@ -36,7 +36,6 @@
 #include <linux/mutex.h>
 #include <linux/inetdevice.h>
 #include <linux/workqueue.h>
-#include <linux/if_arp.h>
 #include <net/arp.h>
 #include <net/neighbour.h>
 #include <net/route.h>
@@ -92,17 +91,7 @@ EXPORT_SYMBOL(rdma_addr_unregister_client);
 int rdma_copy_addr(struct rdma_dev_addr *dev_addr, struct net_device *dev,
                     const unsigned char *dst_dev_addr)
 {
-       switch (dev->type) {
-       case ARPHRD_INFINIBAND:
-               dev_addr->dev_type = RDMA_NODE_IB_CA;
-               break;
-       case ARPHRD_ETHER:
-               dev_addr->dev_type = RDMA_NODE_RNIC;
-               break;
-       default:
-               return -EADDRNOTAVAIL;
-       }
-
+       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)

diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 699ad12b3a2f8ee803c16e7b1c67902118cb127d..b305b5c17f8dfad5b635a61007feec1fb3e67001 100644 (file)
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -330,11 +330,11 @@ static int cma_acquire_dev(struct rdma_id_private *id_priv)
        union ib_gid gid;
        int ret = -ENODEV;
 
-       switch (rdma_node_get_transport(dev_addr->dev_type)) {
-       case RDMA_TRANSPORT_IB:
+       switch (dev_addr->dev_type) {
+       case ARPHRD_INFINIBAND:
                ib_addr_get_sgid(dev_addr, &gid);
                break;
-       case RDMA_TRANSPORT_IWARP:
+       case ARPHRD_ETHER:
                iw_addr_get_sgid(dev_addr, &gid);
                break;
        default:

diff --git a/include/rdma/ib_addr.h b/include/rdma/ib_addr.h
index 27f17cc2c9194d6053c2f69f879ed867b982230e..3a39c55d2b9a9ae842fa8feec85e76e726f977fa 100644 (file)
--- a/include/rdma/ib_addr.h
+++ b/include/rdma/ib_addr.h
@@ -36,6 +36,7 @@
 
 #include <linux/in.h>
 #include <linux/in6.h>
+#include <linux/if_arp.h>
 #include <linux/netdevice.h>
 #include <linux/socket.h>
 #include <rdma/ib_verbs.h>
@@ -60,7 +61,7 @@ struct rdma_dev_addr {
        unsigned char src_dev_addr[MAX_ADDR_LEN];
        unsigned char dst_dev_addr[MAX_ADDR_LEN];
        unsigned char broadcast[MAX_ADDR_LEN];
-       enum rdma_node_type dev_type;
+       unsigned short dev_type;
        int bound_dev_if;
 };