1 files changed, 7 insertions, 2 deletions

diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 91652e7235e4..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;
@@ -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);