Skip to content

Commit

Permalink
r8169: fix the default setting of rx vlan
Browse files Browse the repository at this point in the history
If the parameter "features" of __rtl8169_set_features() is equal to
dev->features, the variable "changed" is alwayes 0, and nothing would
be changed.

Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
hayeswang authored and David S. Miller committed Sep 13, 2014
1 parent 618073e commit 48c2040
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion drivers/net/ethernet/realtek/r8169.c
Original file line number Diff line number Diff line change
Expand Up @@ -6707,7 +6707,12 @@ static int rtl_open(struct net_device *dev)

rtl8169_init_phy(dev, tp);

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

RTL_W16(CPlusCmd, tp->cp_cmd);

rtl_pll_power_up(tp);

Expand Down

0 comments on commit 48c2040

Please sign in to comment.