patch-2.2.11 linux/net/rose/af_rose.c

• Lines: 20
• Date: Mon Aug 9 12:04:41 1999
• Orig file: v2.2.10/linux/net/rose/af_rose.c
• Orig date: Wed Oct 7 15:52:55 1998

diff -u --recursive --new-file v2.2.10/linux/net/rose/af_rose.c linux/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 @@
 
 	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]);