diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-06-02 11:39:11 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-06-02 11:39:11 -0400 |
| commit | 1c3f45ab2f7f879ea482501c83899505c31f7539 (patch) | |
| tree | 672465b3b9b3e2e26a8caf74ed64aa6885c52c13 /drivers/net/ixgb/ixgb_osdep.h | |
| parent | 4bcff1b37e7c3aed914d1ce5b45994adc7dbf455 (diff) | |
| parent | e0d6d71440a3a35c6fc2dde09f8e8d4d7bd44dda (diff) | |
Merge with master.kernel.org:/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 9eba92891901..dba20481ee80 100644 --- a/drivers/net/ixgb/ixgb_osdep.h +++ b/drivers/net/ixgb/ixgb_osdep.h | |||
| @@ -45,8 +45,7 @@ | |||
| 45 | /* Don't mdelay in interrupt context! */ \ | 45 | /* Don't mdelay in interrupt context! */ \ |
| 46 | BUG(); \ | 46 | BUG(); \ |
| 47 | } else { \ | 47 | } else { \ |
| 48 | set_current_state(TASK_UNINTERRUPTIBLE); \ | 48 | msleep(x); \ |
| 49 | schedule_timeout((x * HZ)/1000 + 2); \ | ||
| 50 | } } while(0) | 49 | } } while(0) |
| 51 | #endif | 50 | #endif |
| 52 | 51 | ||