projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 48c2040)
r8169: fix setting rx vlan
authorhayeswang <hayeswang@realtek.com>
Fri, 12 Sep 2014 03:35:12 +0000 (11:35 +0800)
committerDavid S. Miller <davem@davemloft.net>
Sat, 13 Sep 2014 20:52:44 +0000 (16:52 -0400)
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>
drivers/net/ethernet/realtek/r8169.c patch | blob | blame | history

diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index f3ce284e54f0d2bbe41ae07984a5deb43a386142..7a7860a17f695017eb03fe3ddd9c50c2787b4273 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -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;