aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/realtek
diff options
context:
space:
mode:
authorHeiner Kallweit <hkallweit1@gmail.com>2019-08-28 22:26:51 +0200
committerDavid S. Miller <davem@davemloft.net>2019-08-29 17:47:27 -0700
commit7366016d2d4c7b2e5168db6fa7920fa094561db5 (patch)
treee76fec9ff4acb2df0f78e8bc2d66d6a16d2a9268 /drivers/net/ethernet/realtek
parentr8169: move disabling interrupt coalescing to RTL8169/RTL8168 init (diff)
downloadlinux-dev-7366016d2d4c7b2e5168db6fa7920fa094561db5.tar.xz
linux-dev-7366016d2d4c7b2e5168db6fa7920fa094561db5.zip
r8169: read common register for PCI commit
RTL8125 uses a different register number for IntrMask. To net have side effects by reading a random register let's use a register that is the same on all supported chip families. 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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index dc799528f8e2..652bacf62de9 100644
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -5135,7 +5135,7 @@ static void rtl_hw_start(struct rtl8169_private *tp)
rtl_lock_config_regs(tp);
/* Initially a 10 us delay. Turned it into a PCI commit. - FR */
- RTL_R8(tp, IntrMask);
+ RTL_R16(tp, CPlusCmd);
RTL_W8(tp, ChipCmd, CmdTxEnb | CmdRxEnb);
rtl_init_rxcfg(tp);
rtl_set_tx_config_registers(tp);