diff options
| author |   hayeswang <hayeswang@realtek.com> | 2014-09-12 11:35:12 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-09-13 16:52:44 -0400 |
| commit | 36d8e82541c4be8f529dce9efbcefd504e085ccf (patch) | |
| tree | a8bacd7ce6db5aca8dbd25185ca97df92d17ffb8 /drivers/net/ethernet/realtek | |
| parent | r8169: fix the default setting of rx vlan (diff) | |
| download | linux-dev-36d8e82541c4be8f529dce9efbcefd504e085ccf.tar.xz linux-dev-36d8e82541c4be8f529dce9efbcefd504e085ccf.zip | |
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>
Diffstat (limited to 'drivers/net/ethernet/realtek')
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index f3ce284e54f0..7a7860a17f69 100644 --- 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; |