diff options
Diffstat (limited to 'drivers/staging/vt6656/device.h')
-rw-r--r-- | drivers/staging/vt6656/device.h | 48 |
1 files changed, 12 insertions, 36 deletions
diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h index 6370d103910..25bf03af773 100644 --- a/drivers/staging/vt6656/device.h +++ b/drivers/staging/vt6656/device.h | |||
@@ -30,47 +30,28 @@ | |||
30 | #define __DEVICE_H__ | 30 | #define __DEVICE_H__ |
31 | 31 | ||
32 | #include <linux/module.h> | 32 | #include <linux/module.h> |
33 | #include <linux/types.h> | ||
34 | #include <linux/init.h> | ||
35 | #include <linux/mm.h> | ||
36 | #include <linux/errno.h> | ||
37 | #include <linux/ioport.h> | ||
38 | #include <linux/pci.h> | ||
39 | #include <linux/kernel.h> | 33 | #include <linux/kernel.h> |
40 | #include <linux/netdevice.h> | ||
41 | #include <linux/etherdevice.h> | ||
42 | #include <linux/skbuff.h> | ||
43 | #include <linux/delay.h> | ||
44 | #include <linux/timer.h> | ||
45 | #include <linux/slab.h> | 34 | #include <linux/slab.h> |
46 | #include <linux/interrupt.h> | 35 | #include <linux/init.h> |
47 | #include <linux/string.h> | 36 | #include <linux/delay.h> |
48 | #include <linux/wait.h> | 37 | #include <linux/device.h> |
38 | #include <linux/firmware.h> | ||
39 | #include <linux/etherdevice.h> | ||
40 | #include <linux/suspend.h> | ||
49 | #include <linux/if_arp.h> | 41 | #include <linux/if_arp.h> |
50 | #include <linux/sched.h> | 42 | #include <linux/wireless.h> |
51 | #include <linux/if.h> | 43 | #include <net/iw_handler.h> |
52 | #include <linux/rtnetlink.h>//James | 44 | #include <net/cfg80211.h> |
53 | #include <linux/proc_fs.h> | 45 | #include <linux/timer.h> |
54 | #include <linux/inetdevice.h> | ||
55 | #include <linux/reboot.h> | ||
56 | #include <linux/usb.h> | 46 | #include <linux/usb.h> |
57 | #include <linux/signal.h> | 47 | |
58 | #include <linux/firmware.h> | 48 | |
59 | #include <asm/io.h> | ||
60 | #include <asm/uaccess.h> | ||
61 | #ifdef SIOCETHTOOL | 49 | #ifdef SIOCETHTOOL |
62 | #define DEVICE_ETHTOOL_IOCTL_SUPPORT | 50 | #define DEVICE_ETHTOOL_IOCTL_SUPPORT |
63 | #include <linux/ethtool.h> | 51 | #include <linux/ethtool.h> |
64 | #else | 52 | #else |
65 | #undef DEVICE_ETHTOOL_IOCTL_SUPPORT | 53 | #undef DEVICE_ETHTOOL_IOCTL_SUPPORT |
66 | #endif | 54 | #endif |
67 | /* Include Wireless Extension definition and check version - Jean II */ | ||
68 | #include <linux/wireless.h> | ||
69 | #include <net/iw_handler.h> // New driver API | ||
70 | |||
71 | #ifndef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT | ||
72 | #define WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT | ||
73 | #endif | ||
74 | 55 | ||
75 | //please copy below macro to driver_event.c for API | 56 | //please copy below macro to driver_event.c for API |
76 | #define RT_INSMOD_EVENT_FLAG 0x0101 | 57 | #define RT_INSMOD_EVENT_FLAG 0x0101 |
@@ -418,7 +399,6 @@ typedef struct __device_info { | |||
418 | struct net_device* dev; | 399 | struct net_device* dev; |
419 | struct net_device_stats stats; | 400 | struct net_device_stats stats; |
420 | 401 | ||
421 | const struct firmware *firmware; | ||
422 | 402 | ||
423 | OPTIONS sOpts; | 403 | OPTIONS sOpts; |
424 | 404 | ||
@@ -734,7 +714,6 @@ typedef struct __device_info { | |||
734 | BYTE byKeyIndex; | 714 | BYTE byKeyIndex; |
735 | 715 | ||
736 | BOOL bAES; | 716 | BOOL bAES; |
737 | BYTE byCntMeasure; | ||
738 | 717 | ||
739 | unsigned int uKeyLength; | 718 | unsigned int uKeyLength; |
740 | BYTE abyKey[WLAN_WEP232_KEYLEN]; | 719 | BYTE abyKey[WLAN_WEP232_KEYLEN]; |
@@ -814,16 +793,13 @@ typedef struct __device_info { | |||
814 | //WPA supplicant daemon | 793 | //WPA supplicant daemon |
815 | struct net_device *wpadev; | 794 | struct net_device *wpadev; |
816 | BOOL bWPADEVUp; | 795 | BOOL bWPADEVUp; |
817 | struct sk_buff *skb; | ||
818 | //-- | 796 | //-- |
819 | 797 | ||
820 | #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT | ||
821 | BOOL bwextstep0; | 798 | BOOL bwextstep0; |
822 | BOOL bwextstep1; | 799 | BOOL bwextstep1; |
823 | BOOL bwextstep2; | 800 | BOOL bwextstep2; |
824 | BOOL bwextstep3; | 801 | BOOL bwextstep3; |
825 | BOOL bWPASuppWextEnabled; | 802 | BOOL bWPASuppWextEnabled; |
826 | #endif | ||
827 | 803 | ||
828 | #ifdef HOSTAP | 804 | #ifdef HOSTAP |
829 | // user space daemon: hostapd, is used for HOSTAP | 805 | // user space daemon: hostapd, is used for HOSTAP |