diff options
author | Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-22 21:50:57 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-22 21:50:57 -0400 |
commit | a5324343955997d1439f26518ddac567cd5d134b (patch) | |
tree | f43558389c41e3a0f076c4ee55d77c4aa1561779 /drivers/net/ixgb/ixgb_osdep.h | |
parent | 8199d3a79c224bbe5943fa08684e1f93a17881b0 (diff) | |
parent | a4936044001694f033fe4ea94d6034d51a6b465c (diff) | |
download | op-kernel-dev-a5324343955997d1439f26518ddac567cd5d134b.zip op-kernel-dev-a5324343955997d1439f26518ddac567cd5d134b.tar.gz |
Merge /spare/repo/linux-2.6/
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 9eba928..dba2048 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 |