diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-11-09 11:04:37 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-11-09 11:04:37 -0800 |
| commit | 14684b93019a2d2ece0df5acaf921924541b928d (patch) | |
| tree | 29cf04da2f22b85b6051b47b3731e91a43d4c94d /drivers/net/ethernet/realtek | |
| parent | Merge branch 'sctp-rfc7829' (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff) | |
| download | linux-dev-14684b93019a2d2ece0df5acaf921924541b928d.tar.xz linux-dev-14684b93019a2d2ece0df5acaf921924541b928d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
One conflict in the BPF samples Makefile, some fixes in 'net' whilst
we were converting over to Makefile.target rules in 'net-next'.
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 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 0704f8bd1df4..8a7b22301296 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -910,6 +910,9 @@ static void r8168g_mdio_write(struct rtl8169_private *tp, int reg, int value) static int r8168g_mdio_read(struct rtl8169_private *tp, int reg) { + if (reg == 0x1f) + return tp->ocp_base == OCP_STD_PHY_BASE ? 0 : tp->ocp_base >> 4; + if (tp->ocp_base != OCP_STD_PHY_BASE) reg -= 0x10; |