The patch titled
r8169: fix a race between PCI probe and dev_open
has been removed from the -mm tree. Its filename was
r8169-fix-a-race-between-pci-probe-and-dev_open.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
Subject: r8169: fix a race between PCI probe and dev_open
From: Francois Romieu <romieu@xxxxxxxxxxxxx>
Call chain:
-> rtl8169_init_one
-> register_netdev (dev_open starts to race...)
-> rtl8169_init_phy
-> rtl8169_set_speed
-> tp->set_speed
-> mod_timer(&tp->timer, ...) (if netif_running() is true)
As netif_running() is true just before dev->open() is issued and the
timer is initialized during dev->open, mod_timer() meets an uninitialized
tp->timer and oopses.
rtl8169_init_phy is only used on rtl8169_init_one so it's fine to never
ask it to activate the timer: the racing dev->open will do it anyway.
Signed-off-by: Francois Romieu <romieu@xxxxxxxxxxxxx>
Cc: Bernhard Walle <bwalle@xxxxxxx>
Cc: Jeff Garzik <jeff@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/net/r8169.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN drivers/net/r8169.c~r8169-fix-a-race-between-pci-probe-and-dev_open drivers/net/r8169.c
--- a/drivers/net/r8169.c~r8169-fix-a-race-between-pci-probe-and-dev_open
+++ a/drivers/net/r8169.c
@@ -1448,7 +1448,7 @@ static void rtl8169_init_phy(struct net_
rtl8169_phy_reset(dev, tp);
- rtl8169_set_speed(dev, autoneg, speed, duplex);
+ tp->set_speed(dev, autoneg, speed, duplex);
if ((RTL_R8(PHYstatus) & TBI_Enable) && netif_msg_link(tp))
printk(KERN_INFO PFX "%s: TBI auto-negotiating\n", dev->name);
_
Patches currently in -mm which might be from romieu@xxxxxxxxxxxxx are
r8169-fix-a-race-between-pci-probe-and-dev_open.patch
git-netdev-all.patch
r8169-warning-fixes.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
