patch-2.1.67 linux/drivers/net/bpqether.c

• Lines: 36
• Date: Sat Nov 29 10:33:19 1997
• Orig file: v2.1.66/linux/drivers/net/bpqether.c
• Orig date: Thu May 29 21:53:07 1997

diff -u --recursive --new-file v2.1.66/linux/drivers/net/bpqether.c linux/drivers/net/bpqether.c
@@ -77,7 +77,6 @@
 #include <linux/stat.h>
 #include <linux/firewall.h>
 #include <linux/module.h>
-#include <linux/net_alias.h>
 #include <linux/init.h>
 
 #include <net/ip.h>
@@ -159,9 +158,6 @@
 	return (
 			dev->type == ARPHRD_ETHER
 			&& strncmp(dev->name, "dummy", 5)
-#ifdef CONFIG_NET_ALIAS
-			&& !net_alias_is(dev)
-#endif
 	);
 }
 
@@ -552,17 +548,7 @@
 	memcpy(dev->broadcast, ax25_bcast, AX25_ADDR_LEN);
 	memcpy(dev->dev_addr,  ax25_defaddr, AX25_ADDR_LEN);
 
-	/* preset with reasonable values */
-
 	dev->flags      = 0;
-	dev->family     = AF_INET;
-
-#ifdef CONFIG_INET
-	dev->pa_addr    = in_aton("192.168.0.1");
-	dev->pa_brdaddr = in_aton("192.168.0.255");
-	dev->pa_mask    = in_aton("255.255.255.0");
-	dev->pa_alen    = 4;
-#endif
 
 #if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
 	dev->hard_header     = ax25_encapsulate;