aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/r8169.c
diff options
context:
space:
mode:
authorFrancois Romieu <romieu@fr.zoreil.com>2007-06-04 22:10:15 +0200
committerJeff Garzik <jeff@garzik.org>2007-07-08 22:16:45 -0400
commit57a9f236ebe76be6fe1c85b5f7b3cea842e44177 (patch)
tree9cfba8a4681507a17a2d9575139cf57b2e7de70d /drivers/net/r8169.c
parentr8169: mac address change support (diff)
downloadlinux-dev-57a9f236ebe76be6fe1c85b5f7b3cea842e44177.tar.xz
linux-dev-57a9f236ebe76be6fe1c85b5f7b3cea842e44177.zip
r8169: perform RX config change after mac filtering
It does not really make sense to update the RX config register before the mac filtering registers. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com> Cc: Edward Hsu <edward_hsu@realtek.com.tw>
Diffstat (limited to 'drivers/net/r8169.c')
-rw-r--r--drivers/net/r8169.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 7aa9cf4e9e98..982a9010c7a9 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -2953,10 +2953,11 @@ static void rtl_set_rx_mode(struct net_device *dev)
mc_filter[1] = 0xffffffff;
}
- RTL_W32(RxConfig, tmp);
RTL_W32(MAR0 + 0, mc_filter[0]);
RTL_W32(MAR0 + 4, mc_filter[1]);
+ RTL_W32(RxConfig, tmp);
+
spin_unlock_irqrestore(&tp->lock, flags);
}