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

Commit 52f5509f authored by Jiri Pirko's avatar Jiri Pirko Committed by Jeff Kirsher
Browse files

e1000: fix vlan processing regression 



This patch fixes a regression introduced by commit "e1000: do vlan
cleanup (799d531)".

Apparently some e1000 chips (not mine) are sensitive about the order of
setting vlan filter and vlan stripping/inserting functionality. So this
patch changes the order so it's the same as before vlan cleanup.

Reported-by: default avatarBen Greear <greearb@candelatech.com>
Signed-off-by: default avatarJiri Pirko <jpirko@redhat.com>
Tested-by: default avatarBen Greear <greearb@candelatech.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent cc3425cd

drivers/net/ethernet/intel/e1000/e1000_main.c

+22 −13
Original line number Diff line number Diff line
@@ -164,6 +164,8 @@ static int e1000_82547_fifo_workaround(struct e1000_adapter *adapter, 
static bool e1000_vlan_used(struct e1000_adapter *adapter);

static void e1000_vlan_mode(struct net_device *netdev,

			    netdev_features_t features);

static void e1000_vlan_filter_on_off(struct e1000_adapter *adapter,

				     bool filter_on);

static int e1000_vlan_rx_add_vid(struct net_device *netdev, u16 vid);

static int e1000_vlan_rx_kill_vid(struct net_device *netdev, u16 vid);

static void e1000_restore_vlan(struct e1000_adapter *adapter);
@@ -1214,7 +1216,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev, 
	if (err)

		goto err_register;



	e1000_vlan_mode(netdev, netdev->features);

	e1000_vlan_filter_on_off(adapter, false);



	/* print bus type/speed/width info */

	e_info(probe, "(PCI%s:%dMHz:%d-bit) %pM\n",
@@ -4770,6 +4772,22 @@ static bool e1000_vlan_used(struct e1000_adapter *adapter) 
	return false;

}



static void __e1000_vlan_mode(struct e1000_adapter *adapter,

			      netdev_features_t features)

{

	struct e1000_hw *hw = &adapter->hw;

	u32 ctrl;



	ctrl = er32(CTRL);

	if (features & NETIF_F_HW_VLAN_RX) {

		/* enable VLAN tag insert/strip */

		ctrl |= E1000_CTRL_VME;

	} else {

		/* disable VLAN tag insert/strip */

		ctrl &= ~E1000_CTRL_VME;

	}

	ew32(CTRL, ctrl);

}

static void e1000_vlan_filter_on_off(struct e1000_adapter *adapter,

				     bool filter_on)

{
@@ -4779,6 +4797,7 @@ static void e1000_vlan_filter_on_off(struct e1000_adapter *adapter, 
	if (!test_bit(__E1000_DOWN, &adapter->flags))

		e1000_irq_disable(adapter);



	__e1000_vlan_mode(adapter, adapter->netdev->features);

	if (filter_on) {

		/* enable VLAN receive filtering */

		rctl = er32(RCTL);
@@ -4802,21 +4821,11 @@ static void e1000_vlan_mode(struct net_device *netdev, 
			    netdev_features_t features)

{

	struct e1000_adapter *adapter = netdev_priv(netdev);

	struct e1000_hw *hw = &adapter->hw;

	u32 ctrl;



	if (!test_bit(__E1000_DOWN, &adapter->flags))

		e1000_irq_disable(adapter);



	ctrl = er32(CTRL);

	if (features & NETIF_F_HW_VLAN_RX) {

		/* enable VLAN tag insert/strip */

		ctrl |= E1000_CTRL_VME;

	} else {

		/* disable VLAN tag insert/strip */

		ctrl &= ~E1000_CTRL_VME;

	}

	ew32(CTRL, ctrl);

	__e1000_vlan_mode(adapter, features);



	if (!test_bit(__E1000_DOWN, &adapter->flags))

		e1000_irq_enable(adapter);