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

Commit 38e0bd98 authored by Yi Zou's avatar Yi Zou Committed by David S. Miller
Browse files

ixgbe: always enable vlan strip/insert when DCB is enabled 



when DCB mode is on, we want the HW VLAN stripping to be always enabled.

Signed-off-by: default avatarYi Zou <yi.zou@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 497f683f

drivers/net/ixgbe/ixgbe_main.c

+9 −1
Original line number Diff line number Diff line
@@ -2845,7 +2845,11 @@ static void ixgbe_vlan_filter_disable(struct ixgbe_adapter *adapter) 


	switch (hw->mac.type) {

	case ixgbe_mac_82598EB:

		vlnctrl &= ~(IXGBE_VLNCTRL_VME | IXGBE_VLNCTRL_VFE);

		vlnctrl &= ~IXGBE_VLNCTRL_VFE;

#ifdef CONFIG_IXGBE_DCB

		if (!(adapter->flags & IXGBE_FLAG_DCB_ENABLED))

			vlnctrl &= ~IXGBE_VLNCTRL_VME;

#endif

		vlnctrl &= ~IXGBE_VLNCTRL_CFIEN;

		IXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, vlnctrl);

		break;
@@ -2853,6 +2857,10 @@ static void ixgbe_vlan_filter_disable(struct ixgbe_adapter *adapter) 
		vlnctrl &= ~IXGBE_VLNCTRL_VFE;

		vlnctrl &= ~IXGBE_VLNCTRL_CFIEN;

		IXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, vlnctrl);

#ifdef CONFIG_IXGBE_DCB

		if (adapter->flags & IXGBE_FLAG_DCB_ENABLED)

			break;

#endif

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

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

			vlnctrl = IXGBE_READ_REG(hw, IXGBE_RXDCTL(j));