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

Commit 068c89b0 authored by Don Skidmore's avatar Don Skidmore Committed by David S. Miller
Browse files

ixgbe: fix tag stripping for VLAN ID 0 



Register VLAN ID 0 so that frames with VLAN ID 0 are received and get
their tag stripped when ixgbe is not in DCB mode.  VLAN ID 0 means
that the frame is 'priority tagged' only - it is not a VLAN, but the
priority value is the tag in valid.  The functions
ixgbe_vlan_rx_register() and ixgbe_vlan_rx_kill_vid() were moved up a
couple functions to correct compiling issues with this change.

Signed-off-by: default avatarDon Skidmore <donald.c.skidmore@intel.com>
Signed-off-by: default avatarPeter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: default avatarEric W Multanen <eric.w.multanen@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 15005a32

drivers/net/ixgbe/ixgbe_main.c

+27 −26
Original line number Diff line number Diff line
@@ -1744,6 +1744,32 @@ static void ixgbe_configure_rx(struct ixgbe_adapter *adapter) 
	IXGBE_WRITE_REG(hw, IXGBE_RXCSUM, rxcsum);

}



static void ixgbe_vlan_rx_add_vid(struct net_device *netdev, u16 vid)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_hw *hw = &adapter->hw;



	/* add VID to filter table */

	hw->mac.ops.set_vfta(&adapter->hw, vid, 0, true);

}



static void ixgbe_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_hw *hw = &adapter->hw;



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

		ixgbe_irq_disable(adapter);



	vlan_group_set_device(adapter->vlgrp, vid, NULL);



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

		ixgbe_irq_enable(adapter);



	/* remove VID from filter table */

	hw->mac.ops.set_vfta(&adapter->hw, vid, 0, false);

}



static void ixgbe_vlan_rx_register(struct net_device *netdev,

                                   struct vlan_group *grp)

{
@@ -1763,6 +1789,7 @@ static void ixgbe_vlan_rx_register(struct net_device *netdev, 
	ctrl |= IXGBE_VLNCTRL_VME;

	ctrl &= ~IXGBE_VLNCTRL_CFIEN;

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

	ixgbe_vlan_rx_add_vid(netdev, 0);



	if (grp) {

		/* enable VLAN tag insert/strip */
@@ -1776,32 +1803,6 @@ static void ixgbe_vlan_rx_register(struct net_device *netdev, 
		ixgbe_irq_enable(adapter);

}



static void ixgbe_vlan_rx_add_vid(struct net_device *netdev, u16 vid)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_hw *hw = &adapter->hw;



	/* add VID to filter table */

	hw->mac.ops.set_vfta(&adapter->hw, vid, 0, true);

}



static void ixgbe_vlan_rx_kill_vid(struct net_device *netdev, u16 vid)

{

	struct ixgbe_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_hw *hw = &adapter->hw;



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

		ixgbe_irq_disable(adapter);



	vlan_group_set_device(adapter->vlgrp, vid, NULL);



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

		ixgbe_irq_enable(adapter);



	/* remove VID from filter table */

	hw->mac.ops.set_vfta(&adapter->hw, vid, 0, false);

}



static void ixgbe_restore_vlan(struct ixgbe_adapter *adapter)

{

	ixgbe_vlan_rx_register(adapter->netdev, adapter->vlgrp);