Commit 353abcfd authored by Jeff Garzik's avatar Jeff Garzik

Merge mandrakesoft.com:/home/jgarzik/repo/linus-2.5

into mandrakesoft.com:/home/jgarzik/repo/net-drivers-2.5
parents c9b0864a 36d56656
...@@ -56,8 +56,7 @@ ...@@ -56,8 +56,7 @@
* *
*/ */
#include <linux/ethtool.h> /* Do *NOT* add other headers here, you are guaranteed to be wrong - Jean II */
#include <asm/uaccess.h>
#include "wavelan_cs.p.h" /* Private header */ #include "wavelan_cs.p.h" /* Private header */
/************************* MISC SUBROUTINES **************************/ /************************* MISC SUBROUTINES **************************/
...@@ -2890,8 +2889,8 @@ static const struct iw_handler_def wavelan_handler_def = ...@@ -2890,8 +2889,8 @@ static const struct iw_handler_def wavelan_handler_def =
.private = (iw_handler *) wavelan_private_handler, .private = (iw_handler *) wavelan_private_handler,
.private_args = (struct iw_priv_args *) wavelan_private_args, .private_args = (struct iw_priv_args *) wavelan_private_args,
}; };
#endif /* WIRELESS_EXT > 12 */
#else /* WIRELESS_EXT > 12 */
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
/* /*
* Perform ioctl : config & info stuff * Perform ioctl : config & info stuff
...@@ -2916,8 +2915,9 @@ wavelan_ioctl(struct net_device * dev, /* Device on wich the ioctl apply */ ...@@ -2916,8 +2915,9 @@ wavelan_ioctl(struct net_device * dev, /* Device on wich the ioctl apply */
ret = netdev_ethtool_ioctl(dev, (void *) rq->ifr_data); ret = netdev_ethtool_ioctl(dev, (void *) rq->ifr_data);
break; break;
#if WIRELESS_EXT <= 12
/* --------------- WIRELESS EXTENSIONS --------------- */ /* --------------- WIRELESS EXTENSIONS --------------- */
/* Now done as iw_handler - Jean II */
case SIOCGIWNAME: case SIOCGIWNAME:
wavelan_get_name(dev, NULL, &(wrq->u), NULL); wavelan_get_name(dev, NULL, &(wrq->u), NULL);
break; break;
...@@ -3191,6 +3191,7 @@ wavelan_ioctl(struct net_device * dev, /* Device on wich the ioctl apply */ ...@@ -3191,6 +3191,7 @@ wavelan_ioctl(struct net_device * dev, /* Device on wich the ioctl apply */
} }
break; break;
#endif /* HISTOGRAM */ #endif /* HISTOGRAM */
#endif /* WIRELESS_EXT <= 12 */
/* ------------------- OTHER IOCTL ------------------- */ /* ------------------- OTHER IOCTL ------------------- */
...@@ -3203,7 +3204,6 @@ wavelan_ioctl(struct net_device * dev, /* Device on wich the ioctl apply */ ...@@ -3203,7 +3204,6 @@ wavelan_ioctl(struct net_device * dev, /* Device on wich the ioctl apply */
#endif #endif
return ret; return ret;
} }
#endif /* WIRELESS_EXT > 12 */
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
/* /*
...@@ -5199,9 +5199,8 @@ wavelan_attach(void) ...@@ -5199,9 +5199,8 @@ wavelan_attach(void)
#ifdef WIRELESS_EXT /* If wireless extension exist in the kernel */ #ifdef WIRELESS_EXT /* If wireless extension exist in the kernel */
#if WIRELESS_EXT > 12 #if WIRELESS_EXT > 12
dev->wireless_handlers = (struct iw_handler_def *)&wavelan_handler_def; 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 */ #endif /* WIRELESS_EXT > 12 */
dev->do_ioctl = wavelan_ioctl; /* old wireless extensions */
dev->get_wireless_stats = wavelan_get_wireless_stats; dev->get_wireless_stats = wavelan_get_wireless_stats;
#endif #endif
......
...@@ -439,6 +439,7 @@ ...@@ -439,6 +439,7 @@
#include <linux/if_arp.h> #include <linux/if_arp.h>
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/fcntl.h> #include <linux/fcntl.h>
#include <linux/ethtool.h>
#ifdef CONFIG_NET_RADIO #ifdef CONFIG_NET_RADIO
#include <linux/wireless.h> /* Wireless extensions */ #include <linux/wireless.h> /* Wireless extensions */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment