vserver 1.9.5.x5

[linux-2.6.git] / drivers / net / gt96100eth.c

diff --git a/drivers/net/gt96100eth.c b/drivers/net/gt96100eth.c
index a41ccc4..666cfbb 100644 (file)
--- a/drivers/net/gt96100eth.c
+++ b/drivers/net/gt96100eth.c
@@ -44,9 +44,9 @@
 #include <linux/skbuff.h>
 #include <linux/delay.h>
 #include <linux/ctype.h>
+#include <linux/bitops.h>
 
 #include <asm/irq.h>
-#include <asm/bitops.h>
 #include <asm/io.h>
 
 #define DESC_BE 1
@@ -187,10 +187,8 @@ static void gt96100_delay(int ms)
 {
        if (in_interrupt())
                return;
-       else {
-               current->state = TASK_INTERRUPTIBLE;
-               schedule_timeout(ms*HZ/1000);
-       }
+       else
+               msleep_interruptible(ms);
 }
 
 static int
@@ -527,7 +525,7 @@ abort(struct net_device *dev, u32 abort_bits)
 
        // wait for abort to complete
        while (GT96100ETH_READ(gp, GT96100_ETH_SDMA_COMM) & abort_bits) {
-               // snooze for 20 msec and check again
+               // snooze for 1 msec and check again
                gt96100_delay(1);
        
                if (--timedout == 0) {