* Re: [PATCH] 2.5.37 wavelan_cs compile error, warning fix
2002-09-20 17:14 [PATCH] 2.5.37 wavelan_cs compile error, warning fix René Scharfe
@ 2002-09-20 22:45 ` Jean Tourrilhes
0 siblings, 0 replies; 2+ messages in thread
From: Jean Tourrilhes @ 2002-09-20 22:45 UTC (permalink / raw)
To: René Scharfe; +Cc: linux-kernel
On Fri, Sep 20, 2002 at 07:14:43PM +0200, Ren? Scharfe wrote:
> 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
---------------------------------------------------------------------
diff -u -p linux/drivers/net/wireless/wavelan_cs.b1.p.h linux/drivers/net/wireless/wavelan_cs.p.h
--- linux/drivers/net/wireless/wavelan_cs.b1.p.h Fri Sep 20 14:29:14 2002
+++ linux/drivers/net/wireless/wavelan_cs.p.h Fri Sep 20 14:29:46 2002
@@ -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 */
diff -u -p linux/drivers/net/wireless/wavelan_cs.b1.c linux/drivers/net/wireless/wavelan_cs.c
--- linux/drivers/net/wireless/wavelan_cs.b1.c Fri Sep 20 14:28:54 2002
+++ linux/drivers/net/wireless/wavelan_cs.c Fri Sep 20 14:34:00 2002
@@ -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
^ permalink raw reply [flat|nested] 2+ messages in thread