Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4315d85 authored by Sean Hefty's avatar Sean Hefty Committed by Roland Dreier
Browse files

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: default avatarSean Hefty <sean.hefty@intel.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent d2e08862

drivers/infiniband/core/addr.c

+1 −12
Original line number Diff line number Diff line
@@ -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)

drivers/infiniband/core/cma.c

+3 −3
Original line number Diff line number Diff line
@@ -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:

include/rdma/ib_addr.h

+2 −1
Original line number Diff line number Diff line
@@ -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;

};