Commit 693e1cde authored by Mustafa Ismail's avatar Mustafa Ismail Committed by Leon Romanovsky
Browse files

RDMA/irdma: Cleanup and rename irdma_netdev_vlan_ipv6() 



The return value from irdma_netdev_vlan_ipv6() is not used. Rename
the functions and change to a void return.

Signed-off-by: default avatarMustafa Ismail <mustafa.ismail@intel.com>
Signed-off-by: default avatarShiraz Saleem <shiraz.saleem@intel.com>
Link: https://lore.kernel.org/r/20230725155505.1069-5-shiraz.saleem@intel.com


Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
parent e49bad78

drivers/infiniband/hw/irdma/cm.c

+10 −13
Original line number Diff line number Diff line
@@ -1591,21 +1591,20 @@ static u8 irdma_iw_get_vlan_prio(u32 *loc_addr, u8 prio, bool ipv4) 
}



/**

 * irdma_netdev_vlan_ipv6 - Gets the netdev and mac

 * irdma_get_vlan_mac_ipv6 - Gets the vlan and mac

 * @addr: local IPv6 address

 * @vlan_id: vlan id for the given IPv6 address

 * @mac: mac address for the given IPv6 address

 *

 * Returns the net_device of the IPv6 address and also sets the

 * vlan id and mac for that address.

 * Returns the vlan id and mac for an IPv6 address.

 */

struct net_device *irdma_netdev_vlan_ipv6(u32 *addr, u16 *vlan_id, u8 *mac)

void irdma_get_vlan_mac_ipv6(u32 *addr, u16 *vlan_id, u8 *mac)

{

	struct net_device *ip_dev = NULL;

	struct in6_addr laddr6;



	if (!IS_ENABLED(CONFIG_IPV6))

		return NULL;

		return;



	irdma_copy_ip_htonl(laddr6.in6_u.u6_addr32, addr);

	if (vlan_id)
@@ -1624,8 +1623,6 @@ struct net_device *irdma_netdev_vlan_ipv6(u32 *addr, u16 *vlan_id, u8 *mac) 
		}

	}

	rcu_read_unlock();



	return ip_dev;

}



/**
@@ -3666,7 +3663,7 @@ int irdma_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) 
		cm_node->vlan_id = irdma_get_vlan_ipv4(cm_node->loc_addr);

	} else {

		cm_node->ipv4 = false;

		irdma_netdev_vlan_ipv6(cm_node->loc_addr, &cm_node->vlan_id,

		irdma_get_vlan_mac_ipv6(cm_node->loc_addr, &cm_node->vlan_id,

					NULL);

	}

	ibdev_dbg(&iwdev->ibdev, "CM: Accept vlan_id=%d\n",
@@ -3875,7 +3872,7 @@ int irdma_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) 
				    raddr6->sin6_addr.in6_u.u6_addr32);

		cm_info.loc_port = ntohs(laddr6->sin6_port);

		cm_info.rem_port = ntohs(raddr6->sin6_port);

		irdma_netdev_vlan_ipv6(cm_info.loc_addr, &cm_info.vlan_id,

		irdma_get_vlan_mac_ipv6(cm_info.loc_addr, &cm_info.vlan_id,

					NULL);

	}

	cm_info.cm_id = cm_id;
@@ -4005,7 +4002,7 @@ int irdma_create_listen(struct iw_cm_id *cm_id, int backlog) 
				    laddr6->sin6_addr.in6_u.u6_addr32);

		cm_info.loc_port = ntohs(laddr6->sin6_port);

		if (ipv6_addr_type(&laddr6->sin6_addr) != IPV6_ADDR_ANY) {

			irdma_netdev_vlan_ipv6(cm_info.loc_addr,

			irdma_get_vlan_mac_ipv6(cm_info.loc_addr,

						&cm_info.vlan_id, NULL);

		} else {

			cm_info.vlan_id = 0xFFFF;

drivers/infiniband/hw/irdma/main.h

+1 −1
Original line number Diff line number Diff line
@@ -533,7 +533,7 @@ void irdma_gen_ae(struct irdma_pci_f *rf, struct irdma_sc_qp *qp, 
void irdma_copy_ip_ntohl(u32 *dst, __be32 *src);

void irdma_copy_ip_htonl(__be32 *dst, u32 *src);

u16 irdma_get_vlan_ipv4(u32 *addr);

struct net_device *irdma_netdev_vlan_ipv6(u32 *addr, u16 *vlan_id, u8 *mac);

void irdma_get_vlan_mac_ipv6(u32 *addr, u16 *vlan_id, u8 *mac);

struct ib_mr *irdma_reg_phys_mr(struct ib_pd *ib_pd, u64 addr, u64 size,

				int acc, u64 *iova_start);

int irdma_upload_qp_context(struct irdma_qp *iwqp, bool freeze, bool raw);

drivers/infiniband/hw/irdma/verbs.c

+1 −1
Original line number Diff line number Diff line
@@ -3994,7 +3994,7 @@ static int irdma_attach_mcast(struct ib_qp *ibqp, union ib_gid *ibgid, u16 lid) 
	if (!ipv6_addr_v4mapped((struct in6_addr *)ibgid)) {

		irdma_copy_ip_ntohl(ip_addr,

				    sgid_addr.saddr_in6.sin6_addr.in6_u.u6_addr32);

		irdma_netdev_vlan_ipv6(ip_addr, &vlan_id, NULL);

		irdma_get_vlan_mac_ipv6(ip_addr, &vlan_id, NULL);

		ipv4 = false;

		ibdev_dbg(&iwdev->ibdev,

			  "VERBS: qp_id=%d, IP6address=%pI6\n", ibqp->qp_num,