Commit df25e164 authored Apr 28, 2005 by Malli Chilakala Committed by Jeff Garzik May 12, 2005

[PATCH] e1000: Fix msec-delay definition to use msleep

Fix msec-delay definition in e1000_osdep.h to use msleep

Signed-off-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Signed-off-by: Ganesh Venkatesan <ganesh.venkatesan@intel.com>
Signed-off-by: John Ronciak <john.ronciak@intel.com>
diff -up net-drivers-2.6/drivers/net/e1000/e1000_osdep.h net-drivers-2.6/drivers/net/e1000.new/e1000_osdep.h

parent e4eff729

drivers/net/e1000/e1000_osdep.h

+6 −1

Original line number	Diff line number	Diff line
		@@ -42,7 +42,12 @@
		#include <linux/sched.h>

		#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