diff options
| author |   Heiner Kallweit <hkallweit1@gmail.com> | 2019-09-01 10:42:44 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-09-01 11:37:36 -0700 |
| commit | dc161162e42ca51daff50e86a4a4bb8395d60501 (patch) | |
| tree | 089c632c2fc79188bccf9a744c6c8b61d9e9de09 /drivers/net/ethernet/realtek | |
| parent | net/ncsi: add response handlers for PLDM over NC-SI (diff) | |
| download | linux-dev-dc161162e42ca51daff50e86a4a4bb8395d60501.tar.xz linux-dev-dc161162e42ca51daff50e86a4a4bb8395d60501.zip | |
r8169: don't set bit RxVlan on RTL8125
RTL8125 uses a different register for VLAN offloading config,
therefore don't set bit RxVlan.
Fixes: f1bce4ad2f1c ("r8169: add support for RTL8125")
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/realtek')
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169_main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index f337f81e4540..0ef01db1f8b8 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -7164,8 +7164,10 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) NETIF_F_HIGHDMA; dev->priv_flags |= IFF_LIVE_ADDR_CHANGE; - tp->cp_cmd |= RxChkSum | RxVlan; - + 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. |