RDMA/bnxt_re: Use helper function to set GUIDs
Subsystems (2)
PATCH 1/1 RDMA/bnxt_re: Use helper function to set GUIDs
Use addrconf_addr_eui48() helper function to set the GUIDs and remove the driver specific version.
Signed-off-by Kamal Heib <[email protected]>
--- drivers/infiniband/hw/bnxt_re/ib_verbs.c | 5 +++-- drivers/infiniband/hw/bnxt_re/main.c | 2 +- drivers/infiniband/hw/bnxt_re/qplib_res.c | 17 ----------------- drivers/infiniband/hw/bnxt_re/qplib_res.h | 1 - 4 files changed, 4 insertions(+), 21 deletions(-)
drivers/infiniband/hw/bnxt_re/ib_verbs.c +3 -2
@@ -41,6 +41,7 @@#include <linux/pci.h> #include <linux/netdevice.h> #include <linux/if_ether.h> +#include <net/addrconf.h> #include <rdma/ib_verbs.h> #include <rdma/ib_user_verbs.h>
@@ -130,8 +131,8 @@ int bnxt_re_query_device(struct ib_device *ibdev,memcpy (&ib_attr->fw_ver, dev_attr->fw_ver,min (sizeof (dev_attr->fw_ver),sizeof (ib_attr->fw_ver))); -bnxt_qplib_get_guid (rdev->netdev->dev_addr, - (u8 *)&ib_attr->sys_image_guid); +addrconf_addr_eui48 ((u8 *)&ib_attr->sys_image_guid, + rdev->netdev->dev_addr); ib_attr->max_mr_size =BNXT_RE_MAX_MR_SIZE ; ib_attr->page_size_cap =BNXT_RE_PAGE_SIZE_SUPPORTED ;
drivers/infiniband/hw/bnxt_re/main.c +1 -1
@@ -730,7 +730,7 @@ static int bnxt_re_register_ib(struct bnxt_re_dev *rdev) strlen(BNXT_RE_DESC) + 5); ibdev->phys_port_cnt =1 ; -bnxt_qplib_get_guid (rdev->netdev->dev_addr, (u8 *)&ibdev->node_guid); +addrconf_addr_eui48 ((u8 *)&ibdev->node_guid, rdev->netdev->dev_addr); ibdev->num_comp_vectors = rdev->num_msix -1 ; ibdev->dev.parent = &rdev->en_dev->pdev->dev;
drivers/infiniband/hw/bnxt_re/qplib_res.c +0 -17
@@ -572,23 +572,6 @@ int bnxt_qplib_alloc_ctx(struct bnxt_qplib_res *res,return rc; } -/* GUID */ -void bnxt_qplib_get_guid (const u8 *dev_addr,u8 *guid) -{ -u8 mac[ETH_ALEN ]; - -/* MAC-48 to EUI-64 mapping */ -memcpy (mac, dev_addr,ETH_ALEN ); - guid[0 ] = mac[0 ] ^2 ; - guid[1 ] = mac[1 ]; - guid[2 ] = mac[2 ]; - guid[3 ] =0xff ; - guid[4 ] =0xfe ; - guid[5 ] = mac[3 ]; - guid[6 ] = mac[4 ]; - guid[7 ] = mac[5 ]; -} -static void bnxt_qplib_free_sgid_tbl (struct bnxt_qplib_res *res,struct bnxt_qplib_sgid_tbl *sgid_tbl) {
drivers/infiniband/hw/bnxt_re/qplib_res.h +0 -1
@@ -346,7 +346,6 @@ void bnxt_qplib_free_hwq(struct bnxt_qplib_res *res, struct bnxt_qplib_hwq *hwq);int bnxt_qplib_alloc_init_hwq (struct bnxt_qplib_hwq *hwq,struct bnxt_qplib_hwq_attr *hwq_attr); -void bnxt_qplib_get_guid (const u8 *dev_addr,u8 *guid);int bnxt_qplib_alloc_pd (struct bnxt_qplib_pd_tbl *pd_tbl,struct bnxt_qplib_pd *pd); int bnxt_qplib_dealloc_pd(struct bnxt_qplib_res *res,
Signature · 1 line
2.31.1
Quoted 10 lines · Kamal Heib
Use
addrconf_addr_eui48()helper function to set the GUIDs and remove the driver specific version.Signed-off-by Kamal Heib <[email protected]>--- drivers/infiniband/hw/bnxt_re/ib_verbs.c | 5 +++-- drivers/infiniband/hw/bnxt_re/main.c | 2 +- drivers/infiniband/hw/bnxt_re/qplib_res.c | 17 ----------------- drivers/infiniband/hw/bnxt_re/qplib_res.h | 1 - 4 files changed, 4 insertions(+), 21 deletions(-)
Applied to for-next, thanks
Jason