diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
| commit | 0ae8dceaebe3659ee0c3352c08125f403e77ebca (patch) | |
| tree | 5085c389f09da78182b899d19fe1068b619a69dd /net/rose | |
| parent | 273767781288c35c9d679e908672b9996cda4c34 (diff) | |
Merge with 2.3.10.
Diffstat (limited to 'net/rose')
| -rw-r--r-- | net/rose/af_rose.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c index 1c27a4724..acba67395 100644 --- a/net/rose/af_rose.c +++ b/net/rose/af_rose.c @@ -54,7 +54,6 @@ #include <linux/proc_fs.h> #include <net/ip.h> #include <net/arp.h> -#include <linux/if_arp.h> #include <linux/init.h> int rose_ndevs = 10; @@ -1509,6 +1508,11 @@ __initfunc(void rose_proto_init(struct net_proto *pro)) for (i = 0; i < rose_ndevs; i++) { dev_rose[i].name = kmalloc(20, GFP_KERNEL); + if(dev_rose[i].name == NULL) + { + printk(KERN_ERR "Rose: unable to register ROSE devices.\n"); + break; + } sprintf(dev_rose[i].name, "rose%d", i); dev_rose[i].init = rose_init; register_netdev(&dev_rose[i]); |