RE: [PATCH] e1000 module parameter incompatiablity

Applied to our development tree.

Thanks,
ganesh 
 
-------------------------------------------------
Ganesh Venkatesan
Network/Storage Division, Hillsboro, OR

-----Original Message-----
From: Stephen Hemminger [mailto:shemminger@osdl.org] 
Sent: Tuesday, June 08, 2004 11:04 AM
To: Venkatesan, Ganesh
Cc: cramerj; Ronciak, John; Jeff Garzik; netdev@oss.sgi.com
Subject: [PATCH] e1000 module parameter incompatiablity

E1000 driver is mixing new style 'module_param' with old style
'MODULE_PARM'
this generates the runtime warning
	e1000: Ignoring new-style parameters in presence of obsolete
ones
and prevents using module parameters to set ring size.

Signed-off-by: Stephen Hemminger <redacted>


diff -Nru a/drivers/net/e1000/e1000_main.c
b/drivers/net/e1000/e1000_main.c

--- a/drivers/net/e1000/e1000_main.c	2004-06-08 11:01:58 -07:00
+++ b/drivers/net/e1000/e1000_main.c	2004-06-08 11:01:58 -07:00

@@ -202,8 +202,8 @@
 MODULE_DESCRIPTION("Intel(R) PRO/1000 Network Driver");
 MODULE_LICENSE("GPL");
 
-static int debug = 3;
-module_param(debug, int, 0);
+static int debug = NETIF_MSG_DRV | NETIF_MSG_PROBE;
+MODULE_PARM(debug, "i");
 MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
 
 /**