diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-02-17 08:15:41 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-02-17 08:15:41 -0500 |
| commit | 750b50ab5687125d8a1dc946d931b00acf016e2c (patch) | |
| tree | eacec989ec38e67da84fcc6842b364670d7a1e34 /drivers/net/tulip/pnic.c | |
| parent | ab479995b191b4256183956c13caabb86331af8e (diff) | |
| parent | 70c07e02625ec46d0ffbfce1acef42d660803528 (diff) | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/tulip/pnic.c')
| -rw-r--r-- | drivers/net/tulip/pnic.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/tulip/pnic.c b/drivers/net/tulip/pnic.c index d9980bde750..ca7e53246ad 100644 --- a/drivers/net/tulip/pnic.c +++ b/drivers/net/tulip/pnic.c @@ -16,6 +16,7 @@ #include <linux/kernel.h> #include <linux/pci.h> +#include <linux/jiffies.h> #include "tulip.h" @@ -68,7 +69,7 @@ void pnic_lnk_change(struct net_device *dev, int csr5) */ if (tulip_media_cap[dev->if_port] & MediaIsMII) return; - if (! tp->nwayset || jiffies - dev->trans_start > 1*HZ) { + if (! tp->nwayset || time_after(jiffies, dev->trans_start + 1*HZ)) { tp->csr6 = 0x00420000 | (tp->csr6 & 0x0000fdff); iowrite32(tp->csr6, ioaddr + CSR6); iowrite32(0x30, ioaddr + CSR12); |