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

Commit 4d6f2859 authored by Yuval Shaia's avatar Yuval Shaia Committed by Doug Ledford
Browse files

{net,IB}/{rxe,usnic}: Utilize generic mac to eui32 function 



This logic seems to be duplicated in (at least) three separate files.
Move it to one place so code can be re-use.

Signed-off-by: default avatarYuval Shaia <yuval.shaia@oracle.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@mellanox.com>
parent a7c81326

drivers/infiniband/hw/usnic/usnic_common_util.h

+3 −8
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ 
#ifndef USNIC_CMN_UTIL_H

#define USNIC_CMN_UTIL_H



#include <net/addrconf.h>



static inline void

usnic_mac_ip_to_gid(const char *const mac, const __be32 inaddr, char *raw_gid)

{
@@ -41,14 +43,7 @@ usnic_mac_ip_to_gid(const char *const mac, const __be32 inaddr, char *raw_gid) 
	raw_gid[1] = 0x80;

	memset(&raw_gid[2], 0, 2);

	memcpy(&raw_gid[4], &inaddr, 4);

	raw_gid[8] = mac[0]^2;

	raw_gid[9] = mac[1];

	raw_gid[10] = mac[2];

	raw_gid[11] = 0xff;

	raw_gid[12] = 0xfe;

	raw_gid[13] = mac[3];

	raw_gid[14] = mac[4];

	raw_gid[15] = mac[5];

	addrconf_addr_eui48(&raw_gid[8], mac);

}



#endif /* USNIC_COMMON_UTIL_H */

drivers/infiniband/sw/rxe/rxe.c

+3 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
 * SOFTWARE.

 */



#include <net/addrconf.h>

#include "rxe.h"

#include "rxe_loc.h"
@@ -180,7 +181,8 @@ static int rxe_init_ports(struct rxe_dev *rxe) 
		return -ENOMEM;



	port->pkey_tbl[0] = 0xffff;

	port->port_guid = rxe_port_guid(rxe);

	addrconf_addr_eui48((unsigned char *)&port->port_guid,

			    rxe->ndev->dev_addr);



	spin_lock_init(&port->port_lock);

drivers/infiniband/sw/rxe/rxe_loc.h

+0 −2
Original line number Diff line number Diff line
@@ -145,7 +145,6 @@ int advance_dma_data(struct rxe_dma_info *dma, unsigned int length); 
int rxe_loopback(struct sk_buff *skb);

int rxe_send(struct rxe_dev *rxe, struct rxe_pkt_info *pkt,

	     struct sk_buff *skb);

__be64 rxe_port_guid(struct rxe_dev *rxe);

struct sk_buff *rxe_init_packet(struct rxe_dev *rxe, struct rxe_av *av,

				int paylen, struct rxe_pkt_info *pkt);

int rxe_prepare(struct rxe_dev *rxe, struct rxe_pkt_info *pkt,
@@ -153,7 +152,6 @@ int rxe_prepare(struct rxe_dev *rxe, struct rxe_pkt_info *pkt, 
enum rdma_link_layer rxe_link_layer(struct rxe_dev *rxe, unsigned int port_num);

const char *rxe_parent_name(struct rxe_dev *rxe, unsigned int port_num);

struct device *rxe_dma_device(struct rxe_dev *rxe);

__be64 rxe_node_guid(struct rxe_dev *rxe);

int rxe_mcast_add(struct rxe_dev *rxe, union ib_gid *mgid);

int rxe_mcast_delete(struct rxe_dev *rxe, union ib_gid *mgid);

drivers/infiniband/sw/rxe/rxe_net.c

+0 −28
Original line number Diff line number Diff line
@@ -84,34 +84,6 @@ struct rxe_dev *get_rxe_by_name(const char *name) 


struct rxe_recv_sockets recv_sockets;



static __be64 rxe_mac_to_eui64(struct net_device *ndev)

{

	unsigned char *mac_addr = ndev->dev_addr;

	__be64 eui64;

	unsigned char *dst = (unsigned char *)&eui64;



	dst[0] = mac_addr[0] ^ 2;

	dst[1] = mac_addr[1];

	dst[2] = mac_addr[2];

	dst[3] = 0xff;

	dst[4] = 0xfe;

	dst[5] = mac_addr[3];

	dst[6] = mac_addr[4];

	dst[7] = mac_addr[5];



	return eui64;

}



__be64 rxe_node_guid(struct rxe_dev *rxe)

{

	return rxe_mac_to_eui64(rxe->ndev);

}



__be64 rxe_port_guid(struct rxe_dev *rxe)

{

	return rxe_mac_to_eui64(rxe->ndev);

}



struct device *rxe_dma_device(struct rxe_dev *rxe)

{

	struct net_device *ndev;

drivers/infiniband/sw/rxe/rxe_verbs.c

+3 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
 */



#include <linux/dma-mapping.h>

#include <net/addrconf.h>

#include "rxe.h"

#include "rxe_loc.h"

#include "rxe_queue.h"
@@ -1238,7 +1239,8 @@ int rxe_register_device(struct rxe_dev *rxe) 
	dev->num_comp_vectors = RXE_NUM_COMP_VECTORS;

	dev->dev.parent = rxe_dma_device(rxe);

	dev->local_dma_lkey = 0;

	dev->node_guid = rxe_node_guid(rxe);

	addrconf_addr_eui48((unsigned char *)&dev->node_guid,

			    rxe->ndev->dev_addr);

	dev->dev.dma_ops = &dma_virt_ops;



	dev->uverbs_abi_ver = RXE_UVERBS_ABI_VERSION;