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/seeq8005.c | |
| parent | ab479995b191b4256183956c13caabb86331af8e (diff) | |
| parent | 70c07e02625ec46d0ffbfce1acef42d660803528 (diff) | |
| download | kernel_samsung_crespo-750b50ab5687125d8a1dc946d931b00acf016e2c.zip kernel_samsung_crespo-750b50ab5687125d8a1dc946d931b00acf016e2c.tar.gz kernel_samsung_crespo-750b50ab5687125d8a1dc946d931b00acf016e2c.tar.bz2 | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/seeq8005.c')
| -rw-r--r-- | drivers/net/seeq8005.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/seeq8005.c b/drivers/net/seeq8005.c index 79dca39..bcef03f 100644 --- a/drivers/net/seeq8005.c +++ b/drivers/net/seeq8005.c @@ -46,6 +46,7 @@ static const char version[] = #include <linux/etherdevice.h> #include <linux/skbuff.h> #include <linux/bitops.h> +#include <linux/jiffies.h> #include <asm/system.h> #include <asm/io.h> @@ -699,7 +700,7 @@ static void hardware_send_packet(struct net_device * dev, char *buf, int length) int ioaddr = dev->base_addr; int status = inw(SEEQ_STATUS); int transmit_ptr = 0; - int tmp; + unsigned long tmp; if (net_debug>4) { printk("%s: send 0x%04x\n",dev->name,length); @@ -724,7 +725,7 @@ static void hardware_send_packet(struct net_device * dev, char *buf, int length) /* drain FIFO */ tmp = jiffies; - while ( (((status=inw(SEEQ_STATUS)) & SEEQSTAT_FIFO_EMPTY) == 0) && (jiffies - tmp < HZ)) + while ( (((status=inw(SEEQ_STATUS)) & SEEQSTAT_FIFO_EMPTY) == 0) && time_before(jiffies, tmp + HZ)) mb(); /* doit ! */ |