Commit ebe0582b authored by Christophe JAILLET's avatar Christophe JAILLET Committed by David S. Miller
Browse files

net: atlantic: Use the bitmap API instead of hand-writing it 



Simplify code by using bitmap_weight() and bitmap_zero() instead of
hand-writing these functions.

Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: default avatarIgor Russkikh <irusskikh@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2afc3b5a

drivers/net/ethernet/aquantia/atlantic/aq_filters.c

+2 −4
Original line number Diff line number Diff line
@@ -826,7 +826,6 @@ int aq_filters_vlans_update(struct aq_nic_s *aq_nic) 
	struct aq_hw_s *aq_hw = aq_nic->aq_hw;

	int hweight = 0;

	int err = 0;

	int i;



	if (unlikely(!aq_hw_ops->hw_filter_vlan_set))

		return -EOPNOTSUPP;
@@ -837,8 +836,7 @@ int aq_filters_vlans_update(struct aq_nic_s *aq_nic) 
			 aq_nic->aq_hw_rx_fltrs.fl2.aq_vlans);



	if (aq_nic->ndev->features & NETIF_F_HW_VLAN_CTAG_FILTER) {

		for (i = 0; i < BITS_TO_LONGS(VLAN_N_VID); i++)

			hweight += hweight_long(aq_nic->active_vlans[i]);

		hweight = bitmap_weight(aq_nic->active_vlans, VLAN_N_VID);



		err = aq_hw_ops->hw_filter_vlan_ctrl(aq_hw, false);

		if (err)
@@ -871,7 +869,7 @@ int aq_filters_vlan_offload_off(struct aq_nic_s *aq_nic) 
	struct aq_hw_s *aq_hw = aq_nic->aq_hw;

	int err = 0;



	memset(aq_nic->active_vlans, 0, sizeof(aq_nic->active_vlans));

	bitmap_zero(aq_nic->active_vlans, VLAN_N_VID);

	aq_fvlan_rebuild(aq_nic, aq_nic->active_vlans,

			 aq_nic->aq_hw_rx_fltrs.fl2.aq_vlans);