Commit 36d8e825 authored Sep 12, 2014 by hayeswang Committed by David S. Miller Sep 13, 2014

r8169: fix setting rx vlan



The setting should depend on the new features not the current one.

Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 48c20407

drivers/net/ethernet/realtek/r8169.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1796,7 +1796,7 @@ static void __rtl8169_set_features(struct net_device *dev,
		else
		tp->cp_cmd &= ~RxChkSum;

		if (dev->features & NETIF_F_HW_VLAN_CTAG_RX)
		if (features & NETIF_F_HW_VLAN_CTAG_RX)
		tp->cp_cmd \|= RxVlan;
		else
		tp->cp_cmd &= ~RxVlan;