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

Commit b77eb45e authored by Niranjana Vishwanathapura's avatar Niranjana Vishwanathapura Committed by Doug Ledford
Browse files

IB/opa_vnic: Properly return the total MACs in UC MAC list 



Do not include EM specified MAC address in total MACs of the
UC MAC list.

Reviewed-by: default avatarSudeep Dutt <sudeep.dutt@intel.com>
Signed-off-by: default avatarNiranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 5a5a85da

drivers/infiniband/ulp/opa_vnic/opa_vnic_vema_iface.c

+5 −3
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ void opa_vnic_query_mcast_macs(struct opa_vnic_adapter *adapter, 
void opa_vnic_query_ucast_macs(struct opa_vnic_adapter *adapter,

			       struct opa_veswport_iface_macs *macs)

{

	u16 start_idx, tot_macs, num_macs, idx = 0, count = 0;

	u16 start_idx, tot_macs, num_macs, idx = 0, count = 0, em_macs = 0;

	struct netdev_hw_addr *ha;



	start_idx = be16_to_cpu(macs->start_idx);
@@ -353,8 +353,10 @@ void opa_vnic_query_ucast_macs(struct opa_vnic_adapter *adapter, 


		/* Do not include EM specified MAC address */

		if (!memcmp(adapter->info.vport.base_mac_addr, ha->addr,

			    ARRAY_SIZE(adapter->info.vport.base_mac_addr)))

			    ARRAY_SIZE(adapter->info.vport.base_mac_addr))) {

			em_macs++;

			continue;

		}



		if (start_idx > idx++)

			continue;
@@ -377,7 +379,7 @@ void opa_vnic_query_ucast_macs(struct opa_vnic_adapter *adapter, 
	}



	tot_macs = netdev_hw_addr_list_count(&adapter->netdev->dev_addrs) +

		   netdev_uc_count(adapter->netdev);

		   netdev_uc_count(adapter->netdev) - em_macs;

	macs->tot_macs_in_lst = cpu_to_be16(tot_macs);

	macs->num_macs_in_msg = cpu_to_be16(count);

	macs->gen_count = cpu_to_be16(adapter->info.vport.uc_macs_gen_count);