patch-1.3.19 linux/drivers/net/net_init.c

• Lines: 21
• Date: Tue Aug 15 18:46:26 1995
• Orig file: v1.3.18/linux/drivers/net/net_init.c
• Orig date: Sun Aug 13 14:45:32 1995

diff -u --recursive --new-file v1.3.18/linux/drivers/net/net_init.c linux/drivers/net/net_init.c
@@ -24,6 +24,7 @@
 #include <linux/fs.h>
 #include <linux/malloc.h>
 #include <linux/if_ether.h>
+#include <linux/if_arp.h>
 #include <linux/string.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
@@ -114,8 +115,10 @@
 							dev->priv = (void*) *mem_startp;
 							*mem_startp += sizeof_priv;
 						} else
-							dev->priv = kmalloc(sizeof_priv, GFP_KERNEL);
-						memset(dev->priv, 0, sizeof_priv);
+							dev->priv = sizeof_priv
+							  ? kmalloc(sizeof_priv, GFP_KERNEL)
+							  :	NULL;
+						if (dev->priv) memset(dev->priv, 0, sizeof_priv);
 						goto found;
 					}
 			}