Skip to contentSkip to conversation

2.5.37 wavelan_cs compile error, warning fix

PATCH In review René Scharfe 2 participants 2 messages Sep 20, 2002 Networking drivers (wireless)

lore
Share & tools
lore

René Scharfe

author
#0 lore raw

PATCH 1/1 2.5.37 wavelan_cs compile error, warning fix

Hi,

this patch fixes a compile error and a warning about an unused function in wavelan_cs.c. Compiles, untested.

René

drivers/net/wireless/wavelan_cs.c +3 -0
@@ -56,6 +56,7 @@
  *
  */
 
+#include <linux/types.h>
 #include <linux/ethtool.h>
 #include <asm/uaccess.h>
 #include "wavelan_cs.p.h"		/* Private header */

@@ -1860,6 +1861,7 @@
 }
 #endif	/* HISTOGRAM */
 
+#if WIRELESS_EXT <= 12
 static int netdev_ethtool_ioctl(struct net_device *dev, void *useraddr)
 {
 	u32 ethcmd;

@@ -1880,6 +1882,7 @@
 
 	return -EOPNOTSUPP;
 }
+#endif
 
 /*------------------------------------------------------------------*/
 /*
#1 lore raw
Quoted 6 lines · Ren? Scharfe

Hi,

this patch fixes a compile error and a warning about an unused function in wavelan_cs.c. Compiles, untested.

René

Your patch was not correct. I've just sent the proper patch to
Jeff. See below ;-)

Jean

---------------------------------------------------------------------

drivers/net/wireless/wavelan_cs.p.h renamed from drivers/net/wireless/wavelan_cs.b1.p.h +1 -0
diff -u -p linux/drivers/net/wireless/wavelan_cs.b1.p.h linux/drivers/net/wireless/wavelan_cs.p.h
@@ -439,6 +439,7 @@
 #include <linux/if_arp.h>
 #include <linux/ioport.h>
 #include <linux/fcntl.h>
+#include <linux/ethtool.h>
 
 #ifdef CONFIG_NET_RADIO
 #include <linux/wireless.h>		/* Wireless extensions */
drivers/net/wireless/wavelan_cs.c renamed from drivers/net/wireless/wavelan_cs.b1.c +6 -7
diff -u -p linux/drivers/net/wireless/wavelan_cs.b1.c linux/drivers/net/wireless/wavelan_cs.c
@@ -56,8 +56,7 @@
  *
  */
 
-#include <linux/ethtool.h>
-#include <asm/uaccess.h>
+/* Do *NOT* add other headers here, you are guaranteed to be wrong - Jean II */
 #include "wavelan_cs.p.h"		/* Private header */
 
 /************************* MISC SUBROUTINES **************************/

@@ -2890,8 +2889,8 @@ static const struct iw_handler_def	wavel
 	.private	= (iw_handler *) wavelan_private_handler,
 	.private_args	= (struct iw_priv_args *) wavelan_private_args,
 };
+#endif /* WIRELESS_EXT > 12 */
 
-#else /* WIRELESS_EXT > 12 */
 /*------------------------------------------------------------------*/
 /*
  * Perform ioctl : config & info stuff

@@ -2916,8 +2915,9 @@ wavelan_ioctl(struct net_device *	dev,	/
       ret = netdev_ethtool_ioctl(dev, (void *) rq->ifr_data);
       break;
 
+#if WIRELESS_EXT <= 12
       /* --------------- WIRELESS EXTENSIONS --------------- */
-
+      /* Now done as iw_handler - Jean II */
     case SIOCGIWNAME:
       wavelan_get_name(dev, NULL, &(wrq->u), NULL);
       break;

@@ -3191,6 +3191,7 @@ wavelan_ioctl(struct net_device *	dev,	/
       }
       break;
 #endif	/* HISTOGRAM */
+#endif /* WIRELESS_EXT <= 12 */
 
       /* ------------------- OTHER IOCTL ------------------- */
 

@@ -3203,7 +3204,6 @@ wavelan_ioctl(struct net_device *	dev,	/
 #endif
   return ret;
 }
-#endif /* WIRELESS_EXT > 12 */
 
 /*------------------------------------------------------------------*/
 /*

@@ -5199,9 +5199,8 @@ wavelan_attach(void)
 #ifdef WIRELESS_EXT	/* If wireless extension exist in the kernel */
 #if WIRELESS_EXT > 12
   dev->wireless_handlers = (struct iw_handler_def *)&wavelan_handler_def;
-#else /* WIRELESS_EXT > 12 */
-  dev->do_ioctl = wavelan_ioctl;	/* wireless extensions */
 #endif /* WIRELESS_EXT > 12 */
+  dev->do_ioctl = wavelan_ioctl;	/* old wireless extensions */
   dev->get_wireless_stats = wavelan_get_wireless_stats;
 #endif