commit | 85ab8b245ec6572eb489d0fe76c5573851d7b7ad | [log] [tgz] |
---|---|---|
author | Heiner Kallweit <hkallweit1@gmail.com> | Sat Apr 18 23:08:43 2020 +0200 |
committer | David S. Miller <davem@davemloft.net> | Sat Apr 18 20:20:10 2020 -0700 |
tree | 26fc0b3d439b8ce7c1ece6fff0038b64ac27e3f7 | |
parent | a9b3d56830a3d626a0d85adc285ea94e829b6e9d [diff] |
r8169: preserve VLAN setting on RTL8125 in rtl_init_rxcfg So far we set RX_VLAN_8125 unconditionally, even if NETIF_F_HW_VLAN_CTAG_RX may not be set. Don't touch these bits, and let only rtl8169_set_features() control them. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>