diff options
Diffstat (limited to 'net/wanrouter')
-rw-r--r-- | net/wanrouter/Makefile | 2 | ||||
-rw-r--r-- | net/wanrouter/wanmain.c | 6 | ||||
-rw-r--r-- | net/wanrouter/wanproc.c | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/net/wanrouter/Makefile b/net/wanrouter/Makefile index 9f188ab3dcd0..4da14bc48078 100644 --- a/net/wanrouter/Makefile +++ b/net/wanrouter/Makefile | |||
@@ -4,4 +4,4 @@ | |||
4 | 4 | ||
5 | obj-$(CONFIG_WAN_ROUTER) += wanrouter.o | 5 | obj-$(CONFIG_WAN_ROUTER) += wanrouter.o |
6 | 6 | ||
7 | wanrouter-objs := wanproc.o wanmain.o | 7 | wanrouter-y := wanproc.o wanmain.o |
diff --git a/net/wanrouter/wanmain.c b/net/wanrouter/wanmain.c index 2bf23406637a..788a12c1eb5d 100644 --- a/net/wanrouter/wanmain.c +++ b/net/wanrouter/wanmain.c | |||
@@ -59,8 +59,6 @@ | |||
59 | #include <asm/uaccess.h> /* copy_to/from_user */ | 59 | #include <asm/uaccess.h> /* copy_to/from_user */ |
60 | #include <linux/init.h> /* __initfunc et al. */ | 60 | #include <linux/init.h> /* __initfunc et al. */ |
61 | 61 | ||
62 | #define KMEM_SAFETYZONE 8 | ||
63 | |||
64 | #define DEV_TO_SLAVE(dev) (*((struct net_device **)netdev_priv(dev))) | 62 | #define DEV_TO_SLAVE(dev) (*((struct net_device **)netdev_priv(dev))) |
65 | 63 | ||
66 | /* | 64 | /* |
@@ -471,7 +469,7 @@ static int wanrouter_device_setup(struct wan_device *wandev, | |||
471 | data = vmalloc(conf->data_size); | 469 | data = vmalloc(conf->data_size); |
472 | if (!data) { | 470 | if (!data) { |
473 | printk(KERN_INFO | 471 | printk(KERN_INFO |
474 | "%s: ERROR, Faild allocate kernel memory !\n", | 472 | "%s: ERROR, Failed allocate kernel memory !\n", |
475 | wandev->name); | 473 | wandev->name); |
476 | kfree(conf); | 474 | kfree(conf); |
477 | return -ENOBUFS; | 475 | return -ENOBUFS; |
@@ -481,7 +479,7 @@ static int wanrouter_device_setup(struct wan_device *wandev, | |||
481 | err = wandev->setup(wandev, conf); | 479 | err = wandev->setup(wandev, conf); |
482 | } else { | 480 | } else { |
483 | printk(KERN_INFO | 481 | printk(KERN_INFO |
484 | "%s: ERROR, Faild to copy from user data !\n", | 482 | "%s: ERROR, Failed to copy from user data !\n", |
485 | wandev->name); | 483 | wandev->name); |
486 | err = -EFAULT; | 484 | err = -EFAULT; |
487 | } | 485 | } |
diff --git a/net/wanrouter/wanproc.c b/net/wanrouter/wanproc.c index 11f25c7a7a05..f346395314ba 100644 --- a/net/wanrouter/wanproc.c +++ b/net/wanrouter/wanproc.c | |||
@@ -51,7 +51,7 @@ | |||
51 | 51 | ||
52 | /* | 52 | /* |
53 | * Structures for interfacing with the /proc filesystem. | 53 | * Structures for interfacing with the /proc filesystem. |
54 | * Router creates its own directory /proc/net/router with the folowing | 54 | * Router creates its own directory /proc/net/router with the following |
55 | * entries: | 55 | * entries: |
56 | * config device configuration | 56 | * config device configuration |
57 | * status global device statistics | 57 | * status global device statistics |