diff options
| author |   Francois Romieu <romieu@fr.zoreil.com> | 2007-03-09 00:00:05 +0100 |
|---|---|---|
| committer |   Jeff Garzik <jeff@garzik.org> | 2007-03-09 11:51:32 -0500 |
| commit | 2efa53f373ed811d4860904f5205b8a3b376e253 (patch) | |
| tree | a47ea2592e5e1e46410d771dfc4369823f29a563 /drivers/net/r8169.c | |
| parent | r8169: revert bogus BMCR reset (diff) | |
| download | linux-dev-2efa53f373ed811d4860904f5205b8a3b376e253.tar.xz linux-dev-2efa53f373ed811d4860904f5205b8a3b376e253.zip | |
r8169: fix a race between PCI probe and dev_open
Initialize the timer with the rest of the private-struct.
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/r8169.c')
| -rw-r--r-- | drivers/net/r8169.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 6693a305bcce..521b5f0618a4 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -1368,11 +1368,7 @@ static inline void rtl8169_request_timer(struct net_device *dev) (tp->phy_version >= RTL_GIGA_PHY_VER_H)) return; - init_timer(timer); - timer->expires = jiffies + RTL8169_PHY_TIMEOUT; - timer->data = (unsigned long)(dev); - timer->function = rtl8169_phy_timer; - add_timer(timer); + mod_timer(timer, jiffies + RTL8169_PHY_TIMEOUT); } #ifdef CONFIG_NET_POLL_CONTROLLER @@ -1685,6 +1681,10 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) tp->mmio_addr = ioaddr; tp->align = rtl_cfg_info[ent->driver_data].align; + init_timer(&tp->timer); + tp->timer.data = (unsigned long) dev; + tp->timer.function = rtl8169_phy_timer; + spin_lock_init(&tp->lock); rc = register_netdev(dev); |