diff options
| author |   Heiner Kallweit <hkallweit1@gmail.com> | 2020-04-18 23:10:03 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-04-18 20:20:11 -0700 |
| commit | 145192f83a1184ca8f2ef4508e7a93bb783bb444 (patch) | |
| tree | d5b373e7eba27179b158d48f68efe8ef92353ad8 | |
| parent | r8169: preserve VLAN setting on RTL8125 in rtl_init_rxcfg (diff) | |
| download | wireguard-linux-145192f83a1184ca8f2ef4508e7a93bb783bb444.tar.xz wireguard-linux-145192f83a1184ca8f2ef4508e7a93bb783bb444.zip | |
r8169: use rtl8169_set_features in rtl8169_init_one
At that place in rtl_init_one() we can safely use rtl8169_set_features()
to configure the chip according to the default features.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169_main.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index e37ff1a5161d..e8c55b795c76 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -5446,10 +5446,6 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) dev->vlan_features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO; dev->priv_flags |= IFF_LIVE_ADDR_CHANGE; - tp->cp_cmd |= RxChkSum; - /* RTL8125 uses register RxConfig for VLAN offloading config */ - if (!rtl_is_8125(tp)) - tp->cp_cmd |= RxVlan; /* * Pretend we are using VLANs; This bypasses a nasty bug where * Interrupts stop flowing on high load on 8110SCd controllers. @@ -5481,6 +5477,9 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) dev->hw_features |= NETIF_F_RXALL; dev->hw_features |= NETIF_F_RXFCS; + /* configure chip for default features */ + rtl8169_set_features(dev, dev->features); + jumbo_max = rtl_jumbo_max(tp); if (jumbo_max) dev->max_mtu = jumbo_max; |