drivers/net/wireless/tiacx/: remove code for WIRELESS_EXT < 18
Subsystems (3)
PATCH 1/1 drivers/net/wireless/tiacx/: remove code for WIRELESS_EXT < 18
WIRELESS_EXT < 18 will never be true in the kernel.
Signed-off-by Adrian Bunk <[email protected]>
---
drivers/net/wireless/tiacx/acx_struct.h | 5 drivers/net/wireless/tiacx/common.c | 4 drivers/net/wireless/tiacx/conv.c | 2 drivers/net/wireless/tiacx/ioctl.c | 436 ----------------------- drivers/net/wireless/tiacx/pci.c | 8 drivers/net/wireless/tiacx/usb.c | 6 drivers/net/wireless/tiacx/wlan.c | 2 drivers/net/wireless/tiacx/wlan_compat.h | 10 8 files changed, 1 insertion(+), 472 deletions(-)
WIRELESS_EXT < 18 will never be true in the kernel.
Signed-off-by Adrian Bunk <[email protected]>
---
drivers/net/wireless/tiacx/acx_struct.h | 5 drivers/net/wireless/tiacx/common.c | 4 drivers/net/wireless/tiacx/conv.c | 2 drivers/net/wireless/tiacx/ioctl.c | 436 ----------------------- drivers/net/wireless/tiacx/pci.c | 8 drivers/net/wireless/tiacx/usb.c | 6 drivers/net/wireless/tiacx/wlan.c | 2 drivers/net/wireless/tiacx/wlan_compat.h | 10 8 files changed, 1 insertion(+), 472 deletions(-)
drivers/net/wireless/tiacx/acx_struct.h renamed from drivers/net/wireless/tiacx/acx_struct.h.old +1 -4
@@ -1053,9 +1053,8 @@* the struct net_device. */ /*** Device statistics ***/ struct net_device_stats stats;/* net device statistics */ -#ifdef WIRELESS_EXT struct iw_statistics wstats;/* wireless statistics */ -#endif +/*** Power managment ***/ struct pm_dev *pm;/* PM crap */
@@ -1103,9 +1102,7 @@u8 scan_rate;u16 scan_duration;u16 scan_probe_delay; -#if WIRELESS_EXT >15 struct iw_spy_data spy_data;/* FIXME: needs to be implemented! */ -#endif /*** Wireless network settings ***/ /* copy of the device address (ifconfig hw ether) that we actually use
drivers/net/wireless/tiacx/common.c renamed from drivers/net/wireless/tiacx/common.c.old +0 -4
@@ -46,9 +46,7 @@#include <linux/wireless.h> #include <linux/pm.h> #include <linux/vmalloc.h> -#if WIRELESS_EXT >=13 #include <net/iw_handler.h> -#endif /* WE >= 13 */ #include "acx.h"
@@ -2707,7 +2705,6 @@acxlog (L_ASSOC ,"%s(%d):%s\n" , __func__, new_status,acx_get_status_name (new_status)); -#if WIRELESS_EXT >13 /* wireless_send_event() and SIOCGIWSCAN */ /* wireless_send_event never sleeps */ if (ACX_STATUS_4_ASSOCIATED == new_status) {union iwreq_data wrqu;
@@ -2729,7 +2726,6 @@ wrqu.ap_addr.sa_family =ARPHRD_ETHER ;wireless_send_event (priv->netdev,SIOCGIWAP , &wrqu,NULL ); } -#endif priv->status = new_status;
drivers/net/wireless/tiacx/conv.c renamed from drivers/net/wireless/tiacx/conv.c.old +0 -2
@@ -36,9 +36,7 @@#include <linux/if_arp.h> #include <linux/etherdevice.h> #include <linux/wireless.h> -#if WIRELESS_EXT >=13 #include <net/iw_handler.h> -#endif #include "acx.h"
drivers/net/wireless/tiacx/pci.c renamed from drivers/net/wireless/tiacx/pci.c.old +0 -8
@@ -45,9 +45,7 @@#include <linux/if_arp.h> #include <linux/rtnetlink.h> #include <linux/wireless.h> -#if WIRELESS_EXT >=13 #include <net/iw_handler.h> -#endif #include <linux/netdevice.h> #include <linux/ioport.h> #include <linux/pci.h>
@@ -1820,11 +1818,7 @@ dev->hard_start_xmit = &acx_i_start_xmit; dev->get_stats = &acx_e_get_stats; dev->get_wireless_stats = &acx_e_get_wireless_stats; -#if WIRELESS_EXT >=13 dev->wireless_handlers = (struct iw_handler_def *)&acx_ioctl_handler_def; -#else - dev->do_ioctl = &acx_e_ioctl_old; -#endif dev->set_multicast_list = &acxpci_i_set_multicast_list; dev->tx_timeout = &acxpci_i_tx_timeout; dev->change_mtu = &acx_e_change_mtu;
@@ -3842,7 +3836,6 @@ r100 = txdesc->u.r1.rate; r111 = txdesc->u.r2.rate111; -#if WIRELESS_EXT >13 /* wireless_send_event() and IWEVTXDROP are WE13 */ /* need to check for certain error conditions before we * clean the descriptor: we still need valid descr data here */ if (unlikely (0x30 & error)) {
@@ -3857,7 +3850,6 @@MAC_COPY (wrqu.addr.sa_data, hdr->a1);wireless_send_event (priv->netdev,IWEVTXDROP , &wrqu,NULL ); } -#endif /* ...and free the desc */ txdesc->error =0 ; txdesc->ack_failures =0 ;
drivers/net/wireless/tiacx/wlan.c renamed from drivers/net/wireless/tiacx/wlan.c.old +0 -2
@@ -43,9 +43,7 @@#include <linux/types.h> #include <linux/if_arp.h> #include <linux/wireless.h> -#if WIRELESS_EXT >=13 #include <net/iw_handler.h> -#endif #include "acx.h"
drivers/net/wireless/tiacx/wlan_compat.h renamed from drivers/net/wireless/tiacx/wlan_compat.h.old +0 -9
@@ -228,15 +228,6 @@typedef struct net_device netdevice_t ;#endif -#ifdef WIRELESS_EXT -#if (WIRELESS_EXT <13 ) -struct iw_request_info { -__u16 cmd;/* Wireless Extension command */ -__u16 flags;/* More to come ;-) */ -}; -#endif -#endif -/* Interrupt handler backwards compatibility stuff */ #ifndef IRQ_NONE #define IRQ_NONE
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
drivers/net/wireless/tiacx/ioctl.c renamed from drivers/net/wireless/tiacx/ioctl.c.old +0 -436
495 lines not on this page · raw message
drivers/net/wireless/tiacx/usb.c renamed from drivers/net/wireless/tiacx/usb.c.old +0 -6
@@ -57,9 +57,7 @@#include <linux/rtnetlink.h> #include <linux/etherdevice.h> #include <linux/wireless.h> -#if WIRELESS_EXT >=13 #include <net/iw_handler.h> -#endif #include <linux/vmalloc.h> #include "acx.h"
@@ -622,11 +620,7 @@ dev->hard_start_xmit = (void *)&acx_i_start_xmit; dev->get_stats = (void *)&acx_e_get_stats; dev->get_wireless_stats = (void *)&acx_e_get_wireless_stats; -#if WIRELESS_EXT >=13 dev->wireless_handlers = (struct iw_handler_def *)&acx_ioctl_handler_def; -#else - dev->do_ioctl = (void *)&acx_e_ioctl_old; -#endif dev->set_multicast_list = (void *)&acxusb_i_set_rx_mode;#ifdef HAVE_TX_TIMEOUT dev->tx_timeout = &acxusb_i_tx_timeout;