Skip to content

Commit 78f1cd0

Browse files
Francois Romieudavem330
authored andcommitted
r8169: fix broken register writes
This is quite similar to b39fe41 though said registers are not even documented as 64-bit registers - as opposed to the initial TxDescStartAddress ones - but as single bytes which must be combined into 32 bits at the MMIO read/write level before being merged into a 64 bit logical entity. Credits go to Ben Hutchings <ben@decadent.org.uk> for the MAR registers (aka "multicast is broken for ages on ARM) and to Timo Teräs <timo.teras@iki.fi> for the MAC registers. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 1546a71 commit 78f1cd0

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/net/r8169.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2820,8 +2820,8 @@ static void rtl_rar_set(struct rtl8169_private *tp, u8 *addr)
28202820
spin_lock_irq(&tp->lock);
28212821

28222822
RTL_W8(Cfg9346, Cfg9346_Unlock);
2823-
RTL_W32(MAC0, low);
28242823
RTL_W32(MAC4, high);
2824+
RTL_W32(MAC0, low);
28252825
RTL_W8(Cfg9346, Cfg9346_Lock);
28262826

28272827
spin_unlock_irq(&tp->lock);
@@ -4747,8 +4747,8 @@ static void rtl_set_rx_mode(struct net_device *dev)
47474747
mc_filter[1] = swab32(data);
47484748
}
47494749

4750-
RTL_W32(MAR0 + 0, mc_filter[0]);
47514750
RTL_W32(MAR0 + 4, mc_filter[1]);
4751+
RTL_W32(MAR0 + 0, mc_filter[0]);
47524752

47534753
RTL_W32(RxConfig, tmp);
47544754

0 commit comments

Comments
 (0)