patch-2.3.34 linux/net/core/dev.c

• Lines: 77
• Date: Mon Dec 20 15:07:08 1999
• Orig file: v2.3.33/linux/net/core/dev.c
• Orig date: Tue Dec 7 09:32:52 1999

diff -u --recursive --new-file v2.3.33/linux/net/core/dev.c linux/net/core/dev.c
@@ -87,9 +87,9 @@
 #include <net/profile.h>
 #include <linux/init.h>
 #include <linux/kmod.h>
-#ifdef CONFIG_NET_RADIO
-#include <linux/wireless.h>
-#endif	/* CONFIG_NET_RADIO */
+#if defined(CONFIG_NET_RADIO) || defined(CONFIG_NET_PCMCIA_RADIO)
+#include <linux/wireless.h>		/* Note : will define WIRELESS_EXT */
+#endif	/* CONFIG_NET_RADIO || CONFIG_NET_PCMCIA_RADIO */
 #ifdef CONFIG_PLIP
 extern int plip_init(void);
 #endif
@@ -1307,7 +1307,7 @@
 #endif	/* CONFIG_PROC_FS */
 
 
-#ifdef CONFIG_NET_RADIO
+#ifdef WIRELESS_EXT
 #ifdef CONFIG_PROC_FS
 
 /*
@@ -1392,7 +1392,7 @@
 	return len;
 }
 #endif	/* CONFIG_PROC_FS */
-#endif	/* CONFIG_NET_RADIO */
+#endif	/* WIRELESS_EXT */
 
 void dev_set_promiscuity(struct net_device *dev, int inc)
 {
@@ -1624,13 +1624,13 @@
 				return -EOPNOTSUPP;
 			}
 
-#ifdef CONFIG_NET_RADIO
+#ifdef WIRELESS_EXT
 			if(cmd >= SIOCIWFIRST && cmd <= SIOCIWLAST) {
 				if (dev->do_ioctl)
 					return dev->do_ioctl(dev, ifr, cmd);
 				return -EOPNOTSUPP;
 			}
-#endif	/* CONFIG_NET_RADIO */
+#endif	/* WIRELESS_EXT */
 
 	}
 	return -EINVAL;
@@ -1754,7 +1754,7 @@
 					return -EFAULT;
 				return ret;
 			}
-#ifdef CONFIG_NET_RADIO
+#ifdef WIRELESS_EXT
 			if (cmd >= SIOCIWFIRST && cmd <= SIOCIWLAST) {
 				dev_load(ifr.ifr_name);
 				if (IW_IS_SET(cmd)) {
@@ -1769,7 +1769,7 @@
 					return -EFAULT;
 				return ret;
 			}
-#endif	/* CONFIG_NET_RADIO */
+#endif	/* WIRELESS_EXT */
 			return -EINVAL;
 	}
 }
@@ -2083,9 +2083,9 @@
 #ifdef CONFIG_PROC_FS
 	proc_net_create("dev", 0, dev_get_info);
 	create_proc_read_entry("net/dev_stat", 0, 0, dev_proc_stats, NULL);
-#ifdef CONFIG_NET_RADIO
+#ifdef WIRELESS_EXT
 	proc_net_create("wireless", 0, dev_get_wireless_info);
-#endif	/* CONFIG_NET_RADIO */
+#endif	/* WIRELESS_EXT */
 #endif	/* CONFIG_PROC_FS */
 
 	init_bh(NET_BH, net_bh);