Merge with 2.3.19.

3 files changed, 13 insertions, 15 deletions

diff --git a/net/wanrouter/.cvsignore b/net/wanrouter/.cvsignore
deleted file mode 100644
index 857dd22e9..000000000
--- a/net/wanrouter/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.depend
-.*.flags
diff --git a/net/wanrouter/wanmain.c b/net/wanrouter/wanmain.c
index 0c91e4c44..ae365edaa 100644
--- a/net/wanrouter/wanmain.c
+++ b/net/wanrouter/wanmain.c
@@ -30,7 +30,7 @@
 * Dec 22, 1998  Arnaldo Melo    vmalloc/vfree used in device_setup to allocate
 *                               kernel memory and copy configuration data to
 *                               kernel space (for big firmwares)
-* May 19, 1999  Arnaldo Melo    __initfunc in wanrouter_init
+* May 19, 1999  Arnaldo Melo    __init in wanrouter_init
 *****************************************************************************/
 
 #include <linux/config.h>
@@ -46,7 +46,7 @@
 #include <asm/byteorder.h>	/* htons(), etc. */
 #include <asm/uaccess.h>	/* copy_to/from_user */
 #include <linux/wanrouter.h>	/* WAN router API definitions */
-#include <linux/init.h>		/* __initfunc et al. */
+#include <linux/init.h>		/* __init et al. */
 
 /****** Defines and Macros **************************************************/
 
@@ -105,7 +105,7 @@ static unsigned char oui_802_2[] = { 0x00, 0x80, 0xC2 };
 #endif
 
 #ifndef MODULE
-__initfunc(int wanrouter_init(void))
+int __init wanrouter_init(void)
 {
 	int err;
 	extern int wanpipe_init(void),
@@ -297,7 +297,7 @@ int unregister_wan_device(char* name)
  */
 
 
-int wanrouter_encapsulate (struct sk_buff* skb, struct device* dev)
+int wanrouter_encapsulate (struct sk_buff* skb, struct net_device* dev)
 {
 	int hdr_len = 0;
 
@@ -339,7 +339,7 @@ int wanrouter_encapsulate (struct sk_buff* skb, struct device* dev)
  */
 
 
-unsigned short wanrouter_type_trans (struct sk_buff* skb, struct device* dev)
+unsigned short wanrouter_type_trans (struct sk_buff* skb, struct net_device* dev)
 {
 	int cnt = skb->data[0] ? 0 : 1;	/* there may be a pad present */
 	unsigned short ethertype;
@@ -515,7 +515,7 @@ bail:
  
 static int device_shutdown (wan_device_t* wandev)
 {
-	struct device* dev;
+	struct net_device* dev;
 
 	if (wandev->state == WAN_UNCONFIGURED)
 		return 0;
@@ -569,7 +569,7 @@ static int device_stat (wan_device_t* wandev, wandev_stat_t* u_stat)
 static int device_new_if (wan_device_t* wandev, wanif_conf_t* u_conf)
 {
 	wanif_conf_t conf;
-	struct device* dev;
+	struct net_device* dev;
 	int err;
 
 	if ((wandev->state == WAN_UNCONFIGURED) || (wandev->new_if == NULL))
@@ -581,11 +581,11 @@ static int device_new_if (wan_device_t* wandev, wanif_conf_t* u_conf)
 	if (conf.magic != ROUTER_MAGIC)
 		return -EINVAL;
 		
-	dev = kmalloc(sizeof(struct device), GFP_KERNEL);
+	dev = kmalloc(sizeof(struct net_device), GFP_KERNEL);
 	if (dev == NULL)
 		return -ENOBUFS;
 		
-	memset(dev, 0, sizeof(struct device));
+	memset(dev, 0, sizeof(struct net_device));
 	err = wandev->new_if(wandev, dev, &conf);
 	if (!err)
 	{
@@ -678,7 +678,7 @@ static wan_device_t* find_device (char* name)
 
 static int delete_interface (wan_device_t* wandev, char* name, int force)
 {
-	struct device *dev, *prev;
+	struct net_device *dev, *prev;
 
 	for (dev = wandev->dev, prev = NULL;
 		dev && strcmp(name, dev->name);
diff --git a/net/wanrouter/wanproc.c b/net/wanrouter/wanproc.c
index 1cafd9aeb..948b4af2c 100644
--- a/net/wanrouter/wanproc.c
+++ b/net/wanrouter/wanproc.c
@@ -26,7 +26,7 @@
 #include <linux/malloc.h>	/* kmalloc(), kfree() */
 #include <linux/mm.h>		/* verify_area(), etc. */
 #include <linux/string.h>	/* inline mem*, str* functions */
-#include <linux/init.h>		/* __initfunc et al. */
+#include <linux/init.h>		/* __init et al. */
 #include <asm/segment.h>	/* kernel <-> user copy */
 #include <asm/byteorder.h>	/* htons(), etc. */
 #include <asm/uaccess.h>	/* copy_to_user */
@@ -269,7 +269,7 @@ static char stat_hdr[] =
  *	Initialize router proc interface.
  */
 
-__initfunc(int wanrouter_proc_init (void))
+int __init wanrouter_proc_init (void)
 {
 	int err = proc_register(proc_net, &proc_router);
 
@@ -543,7 +543,7 @@ static int wandev_get_info(char* buf, char** start, off_t offs, int len,
  *	No /proc - output stubs
  */
  
-__initfunc(int wanrouter_proc_init(void))
+int __init wanrouter_proc_init(void)
 {
 	return 0;
 }