Prev: [081/117] powerpc: Reduce printk from pseries_mach_cpu_die()
Next: [082/117] bnx2: Fix lost MSI-X problem on 5709 NICs.
From: Greg KH on 10 May 2010 19:40
2.6.33-stable review patch. If anyone has any objections, please let us know.

------------------

From: Francois Romieu <romieu(a)fr.zoreil.com>

commit 78f1cd02457252e1ffbc6caa44a17424a45286b8 upstream.

This is quite similar to b39fe41f481d20c201012e4483e76c203802dda7
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(a)decadent.org.uk> for the MAR
registers (aka "multicast is broken for ages on ARM) and to
Timo Teräs <timo.teras(a)iki.fi> for the MAC registers.

Signed-off-by: Francois Romieu <romieu(a)fr.zoreil.com>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de>

---
drivers/net/r8169.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -2832,8 +2832,8 @@ static void rtl_rar_set(struct rtl8169_p
spin_lock_irq(&tp->lock);

RTL_W8(Cfg9346, Cfg9346_Unlock);
- RTL_W32(MAC0, low);
RTL_W32(MAC4, high);
+ RTL_W32(MAC0, low);
RTL_W8(Cfg9346, Cfg9346_Lock);

spin_unlock_irq(&tp->lock);
@@ -4813,8 +4813,8 @@ static void rtl_set_rx_mode(struct net_d
mc_filter[1] = swab32(data);
}

- RTL_W32(MAR0 + 0, mc_filter[0]);
RTL_W32(MAR0 + 4, mc_filter[1]);
+ RTL_W32(MAR0 + 0, mc_filter[0]);

RTL_W32(RxConfig, tmp);



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [081/117] powerpc: Reduce printk from pseries_mach_cpu_die()
Next: [082/117] bnx2: Fix lost MSI-X problem on 5709 NICs.