diff options
| author | Michael Mason <ms13sp@gmail.com> | 2010-04-01 15:08:27 +0000 |
|---|---|---|
| committer | Michael Mason <ms13sp@gmail.com> | 2010-04-01 15:08:27 +0000 |
| commit | 543baf628733af8cd5ccf155708b4f0440b2d62a (patch) | |
| tree | 7aac9b51bcf414bfff422f782b89b2a1e272f75e /main/linux-pae/net-git-78f1cd-r8169-fix-broken-register-writes.patch | |
| parent | 3beeaef56aeb6a5731185d9d26a8b5230d59a661 (diff) | |
| parent | f17a218739c78a422681e51d0c1922cad5ef7c50 (diff) | |
| download | aports-543baf628733af8cd5ccf155708b4f0440b2d62a.tar.bz2 aports-543baf628733af8cd5ccf155708b4f0440b2d62a.tar.xz | |
Merge branch 'master' of git://git.alpinelinux.org/aports
Diffstat (limited to 'main/linux-pae/net-git-78f1cd-r8169-fix-broken-register-writes.patch')
| -rw-r--r-- | main/linux-pae/net-git-78f1cd-r8169-fix-broken-register-writes.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/main/linux-pae/net-git-78f1cd-r8169-fix-broken-register-writes.patch b/main/linux-pae/net-git-78f1cd-r8169-fix-broken-register-writes.patch new file mode 100644 index 00000000..f5f72acc --- /dev/null +++ b/main/linux-pae/net-git-78f1cd-r8169-fix-broken-register-writes.patch @@ -0,0 +1,51 @@ +From 78f1cd02457252e1ffbc6caa44a17424a45286b8 Mon Sep 17 00:00:00 2001 +From: Francois Romieu <romieu@fr.zoreil.com> +Date: Sat, 27 Mar 2010 19:35:46 -0700 +Subject: [PATCH] r8169: fix broken register writes +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf8 +Content-Transfer-Encoding: 8bit + +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@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> +--- + drivers/net/r8169.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c +index b93fd23..7193afc 100644 +--- a/drivers/net/r8169.c ++++ b/drivers/net/r8169.c +@@ -2820,8 +2820,8 @@ static void rtl_rar_set(struct rtl8169_private *tp, u8 *addr) + 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); +@@ -4747,8 +4747,8 @@ static void rtl_set_rx_mode(struct net_device *dev) + 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); + +-- +1.7.0.3 + |