From dab2ce79818e630897d7a20af7ad7a9ed6a26be4 Mon Sep 17 00:00:00 2001 From: Malli Chilakala Date: Thu, 28 Apr 2005 19:38:43 -0700 Subject: [PATCH] --- yaml --- r: 1359 b: refs/heads/master c: df25e164878836196ee93d1a5757867da6eac30e h: refs/heads/master i: 1357: 246392c0955d0c59638b4919e35d71a58c5688b4 1355: 67a0fa60b70a1a5f73ab471fe200c1d5f0379182 1351: 9b51497c5848012ff65cd8a5949cd709337c97aa 1343: 39495303acbe7a4c736ebf76f5f7134e5bf4358c v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000/e1000_osdep.h | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f6f5e1eff94c..2df34bcd3af5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4eff7291c977308989b24fdfc7215a501302e6a +refs/heads/master: df25e164878836196ee93d1a5757867da6eac30e diff --git a/trunk/drivers/net/e1000/e1000_osdep.h b/trunk/drivers/net/e1000/e1000_osdep.h index 970c656a517c..2efa3b1b64dc 100644 --- a/trunk/drivers/net/e1000/e1000_osdep.h +++ b/trunk/drivers/net/e1000/e1000_osdep.h @@ -42,7 +42,12 @@ #include #ifndef msec_delay -#define msec_delay(x) msleep(x) +#define msec_delay(x) do { if(in_interrupt()) { \ + /* Don't mdelay in interrupt context! */ \ + BUG(); \ + } else { \ + msleep(x); \ + } } while(0) /* Some workarounds require millisecond delays and are run during interrupt * context. Most notably, when establishing link, the phy may need tweaking