From 8c62dd0b1c47ee75704b2b08b1ae74afe7792e92 Mon Sep 17 00:00:00 2001 From: Francois Romieu Date: Wed, 16 Aug 2006 15:23:13 +0200 Subject: [PATCH] --- yaml --- r: 35311 b: refs/heads/master c: b518fa8eac2d0ac497c0fdb27e4cec68d0249bb7 h: refs/heads/master i: 35309: 6031b9db10ccf406e5f017f044d6ea91bc51e8c5 35307: c6b837417771bfffa7a463654e286a1d869806f4 35303: 3e119539e35998259bcd4a801cf8ad942904661e 35295: 8ae6e363b2b84d96ee1d34d84725f7b995dec4c3 v: v3 --- [refs] | 2 +- trunk/drivers/net/r8169.c | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 6ed390fec02f..e276cd78dba5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 188f4af04618b32b8ec7c630a3f18201c81ce70c +refs/heads/master: b518fa8eac2d0ac497c0fdb27e4cec68d0249bb7 diff --git a/trunk/drivers/net/r8169.c b/trunk/drivers/net/r8169.c index b07d2eadeae6..653b9a7a4178 100644 --- a/trunk/drivers/net/r8169.c +++ b/trunk/drivers/net/r8169.c @@ -1623,10 +1623,10 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) RTL_W8(ChipCmd, CmdReset); /* Check that the chip has finished the reset. */ - for (i = 1000; i > 0; i--) { + for (i = 100; i > 0; i--) { if ((RTL_R8(ChipCmd) & CmdReset) == 0) break; - udelay(10); + msleep_interruptible(1); } /* Identify chip attached to board */ @@ -1848,10 +1848,10 @@ rtl8169_hw_start(struct net_device *dev) RTL_W8(ChipCmd, CmdReset); /* Check that the chip has finished the reset. */ - for (i = 1000; i > 0; i--) { + for (i = 100; i > 0; i--) { if ((RTL_R8(ChipCmd) & CmdReset) == 0) break; - udelay(10); + msleep_interruptible(1); } if (tp->mac_version == RTL_GIGA_MAC_VER_13) { @@ -1914,7 +1914,9 @@ rtl8169_hw_start(struct net_device *dev) RTL_W32(RxDescAddrHigh, ((u64) tp->RxPhyAddr >> 32)); RTL_W8(ChipCmd, CmdTxEnb | CmdRxEnb); RTL_W8(Cfg9346, Cfg9346_Lock); - udelay(10); + + /* Initially a 10 us delay. Turned it into a PCI commit. - FR */ + RTL_R8(IntrMask); RTL_W32(RxMissed, 0);