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

Commit dc63d377 authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller
Browse files

ixgbe: Only set/clear VFE in ixgbe_set_rx_mode 



There appears to be a stray setting of the VFE bit when registering vlans.
This should not be done as vlan filtering should be enabled any time the
interface is not in promiscous mode

Signed-off-by: default avatarMallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Acked-by: default avatarPeter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent edd2ea55

drivers/net/ixgbe/ixgbe_main.c

+10 −8
Original line number Diff line number Diff line
@@ -2336,23 +2336,25 @@ static void ixgbe_vlan_rx_register(struct net_device *netdev, 
	 * not in DCB mode.

	 */

	ctrl = IXGBE_READ_REG(&adapter->hw, IXGBE_VLNCTRL);

	if (adapter->hw.mac.type == ixgbe_mac_82598EB) {

		ctrl |= IXGBE_VLNCTRL_VME | IXGBE_VLNCTRL_VFE;



	/* Disable CFI check */

	ctrl &= ~IXGBE_VLNCTRL_CFIEN;

		IXGBE_WRITE_REG(&adapter->hw, IXGBE_VLNCTRL, ctrl);



	/* enable VLAN tag stripping */

	if (adapter->hw.mac.type == ixgbe_mac_82598EB) {

		ctrl |= IXGBE_VLNCTRL_VME;

	} else if (adapter->hw.mac.type == ixgbe_mac_82599EB) {

		ctrl |= IXGBE_VLNCTRL_VFE;

		/* enable VLAN tag insert/strip */

		ctrl = IXGBE_READ_REG(&adapter->hw, IXGBE_VLNCTRL);

		ctrl &= ~IXGBE_VLNCTRL_CFIEN;

		IXGBE_WRITE_REG(&adapter->hw, IXGBE_VLNCTRL, ctrl);

		for (i = 0; i < adapter->num_rx_queues; i++) {

			u32 ctrl;

			j = adapter->rx_ring[i].reg_idx;

			ctrl = IXGBE_READ_REG(&adapter->hw, IXGBE_RXDCTL(j));

			ctrl |= IXGBE_RXDCTL_VME;

			IXGBE_WRITE_REG(&adapter->hw, IXGBE_RXDCTL(j), ctrl);

		}

	}



	IXGBE_WRITE_REG(&adapter->hw, IXGBE_VLNCTRL, ctrl);



	ixgbe_vlan_rx_add_vid(netdev, 0);



	if (!test_bit(__IXGBE_DOWN, &adapter->state))