Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

[linux-2.6] / drivers / net / ixgb / ixgb_osdep.h

diff --git a/drivers/net/ixgb/ixgb_osdep.h b/drivers/net/ixgb/ixgb_osdep.h
index 9eba9289190183934b7d2475950271b9f4b4cc72..dba20481ee80126e70d0876a5893892ce680ce27 100644 (file)
--- a/drivers/net/ixgb/ixgb_osdep.h
+++ b/drivers/net/ixgb/ixgb_osdep.h
@@ -45,8 +45,7 @@
                                /* Don't mdelay in interrupt context! */ \
                                BUG(); \
                        } else { \
-                               set_current_state(TASK_UNINTERRUPTIBLE); \
-                               schedule_timeout((x * HZ)/1000 + 2); \
+                               msleep(x); \
                        } } while(0)
 #endif