]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: bcb6803) | patch
r8169: preserve VLAN setting on RTL8125 in rtl_init_rxcfg
authorHeiner Kallweit <hkallweit1@gmail.com>
Sat, 18 Apr 2020 21:08:43 +0000 (23:08 +0200)
committerDavid S. Miller <davem@davemloft.net>
Sun, 19 Apr 2020 03:20:10 +0000 (20:20 -0700)
commit35fee2a5824cb249a83622514d0b20d6ec73a5a7
tree26fc0b3d439b8ce7c1ece6fff0038b64ac27e3f7tree | snapshot
parentbcb68038040ba8861aa16d6da640541920bb0a16commit | 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>
drivers/net/ethernet/realtek/r8169_main.c diff | blob | history
Linux Kernel Source Tree.