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

Commit 6982d429 authored by Anjali Singhai Jain's avatar Anjali Singhai Jain Committed by Jeff Kirsher
Browse files

i40e: Remove a redundant filter addition 



Remove a redundant filter addition to stop FW complaints about a redundant
filter removal.

Change-ID: I22bef6b682bd8d43432557e6e2b3e73ffb27b985
Signed-off-by: default avatarAnjali Singhai Jain <anjali.singhai@intel.com>
Signed-off-by: default avatarCatherine Sullivan <catherine.sullivan@intel.com>
Tested-by: default avatarKavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent a47a15f4

drivers/net/ethernet/intel/i40e/i40e_main.c

+7 −4
Original line number Diff line number Diff line
@@ -1965,11 +1965,14 @@ static int i40e_vlan_rx_add_vid(struct net_device *netdev, 


	netdev_info(netdev, "adding %pM vid=%d\n", netdev->dev_addr, vid);



	/* If the network stack called us with vid = 0, we should

	 * indicate to i40e_vsi_add_vlan() that we want to receive

	 * any traffic (i.e. with any vlan tag, or untagged)

	/* If the network stack called us with vid = 0 then

	 * it is asking to receive priority tagged packets with

	 * vlan id 0.  Our HW receives them by default when configured

	 * to receive untagged packets so there is no need to add an

	 * extra filter for vlan 0 tagged packets.

	 */

	ret = i40e_vsi_add_vlan(vsi, vid ? vid : I40E_VLAN_ANY);

	if (vid)

		ret = i40e_vsi_add_vlan(vsi, vid);



	if (!ret && (vid < VLAN_N_VID))

		set_bit(vid, vsi->active_vlans);