diff options
author | Christoph Hellwig <hch@hera.kernel.org> | 2005-05-27 01:16:24 -0700 |
---|---|---|
committer | Christoph Hellwig <hch@melbourne.sgi.com> | 2005-05-27 01:16:24 -0700 |
commit | b19312c4c8f3f84da57bba01d45549df1cf10dcd (patch) | |
tree | 1c34ce89be6b4e257bc03026d0268deb17727044 /drivers/net/ixgb/ixgb_osdep.h | |
parent | d3870398fafd4911bd84573b78be4b6b762f32b0 (diff) | |
parent | 4ec5240ec367a592834385893200dd4fb369354c (diff) |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/net/ixgb/ixgb_osdep.h')
-rw-r--r-- | drivers/net/ixgb/ixgb_osdep.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ixgb/ixgb_osdep.h b/drivers/net/ixgb/ixgb_osdep.h index 9eba9289190..dba20481ee8 100644 --- 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 |