[KJ] [PATCH 6/28] net/e1000_osdep: replace schedule_timeout() with msleep()

[KJ] [PATCH 6/28] net/e1000_osdep: replace schedule_timeout() with msleep()

[Nishanth Aravamudan]

[-- Attachment #1: Type: text/plain, Size: 708 bytes --]

Hi,

Description: Use msleep() instead of schedule_timeout() to guarantee the task
delays as expected.

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>


--- 2.6.10-v/drivers/net/e1000/e1000_osdep.h	2004-12-24 13:34:26.000000000 -0800
+++ 2.6.10/drivers/net/e1000/e1000_osdep.h	2005-01-04 14:57:49.000000000 -0800
@@ -46,8 +46,7 @@
 				/* Don't mdelay in interrupt context! */ \
 	                	BUG(); \
 			} else { \
-				set_current_state(TASK_UNINTERRUPTIBLE); \
-				schedule_timeout((x * HZ)/1000 + 2); \
+				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

[-- Attachment #2: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

[KJ] [PATCH 6/28] net/e1000_osdep: replace schedule_timeout() with

[Nishanth Aravamudan]

[-- Attachment #1: Type: text/plain, Size: 708 bytes --]

Hi,

Description: Use msleep() instead of schedule_timeout() to guarantee the task
delays as expected.

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>


--- 2.6.10-v/drivers/net/e1000/e1000_osdep.h	2004-12-24 13:34:26.000000000 -0800
+++ 2.6.10/drivers/net/e1000/e1000_osdep.h	2005-01-04 14:57:49.000000000 -0800
@@ -46,8 +46,7 @@
 				/* Don't mdelay in interrupt context! */ \
 	                	BUG(); \
 			} else { \
-				set_current_state(TASK_UNINTERRUPTIBLE); \
-				schedule_timeout((x * HZ)/1000 + 2); \
+				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

[-- Attachment #2: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

[KJ] Re: [PATCH 6/28] net/e1000_osdep: replace schedule_timeout() with msleep()

[Nishanth Aravamudan]

[-- Attachment #1: Type: text/plain, Size: 945 bytes --]

On Thu, Jan 06, 2005 at 04:19:31PM -0800, Nishanth Aravamudan wrote:
> Hi,
> 
> Description: Use msleep() instead of schedule_timeout() to guarantee the task
> delays as expected.
> 
> Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
> 
> 
> --- 2.6.10-v/drivers/net/e1000/e1000_osdep.h	2004-12-24 13:34:26.000000000 -0800
> +++ 2.6.10/drivers/net/e1000/e1000_osdep.h	2005-01-04 14:57:49.000000000 -0800
> @@ -46,8 +46,7 @@
>  				/* Don't mdelay in interrupt context! */ \
>  	                	BUG(); \
>  			} else { \
> -				set_current_state(TASK_UNINTERRUPTIBLE); \
> -				schedule_timeout((x * HZ)/1000 + 2); \
> +				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

Please ignore this patch, as there is already a more correct one in the
2.6.10-kj patchset. Sorry for the noise.

Thanks,
Nish

[-- Attachment #2: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

[KJ] Re: [PATCH 6/28] net/e1000_osdep: replace schedule_timeout()

[Nishanth Aravamudan]

[-- Attachment #1: Type: text/plain, Size: 945 bytes --]

On Thu, Jan 06, 2005 at 04:19:31PM -0800, Nishanth Aravamudan wrote:
> Hi,
> 
> Description: Use msleep() instead of schedule_timeout() to guarantee the task
> delays as expected.
> 
> Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
> 
> 
> --- 2.6.10-v/drivers/net/e1000/e1000_osdep.h	2004-12-24 13:34:26.000000000 -0800
> +++ 2.6.10/drivers/net/e1000/e1000_osdep.h	2005-01-04 14:57:49.000000000 -0800
> @@ -46,8 +46,7 @@
>  				/* Don't mdelay in interrupt context! */ \
>  	                	BUG(); \
>  			} else { \
> -				set_current_state(TASK_UNINTERRUPTIBLE); \
> -				schedule_timeout((x * HZ)/1000 + 2); \
> +				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

Please ignore this patch, as there is already a more correct one in the
2.6.10-kj patchset. Sorry for the noise.

Thanks,
Nish

[-- Attachment #2: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors