diff options
| author | Joshua Clayton | 2015-08-06 02:17:18 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-08-08 00:14:03 +0200 |
| commit | 44367877c6c5048ac352c529c63ce0698c1ddd5c (patch) | |
| tree | 9dfefe777e92db42639fd0463e0409ccc3c8965b /drivers/staging/rtl8712/wlan_bssdef.h | |
| parent | staging: rtl8712: removed unused wrapper structs (diff) | |
| download | kernel-qcow2-linux-44367877c6c5048ac352c529c63ce0698c1ddd5c.tar.gz kernel-qcow2-linux-44367877c6c5048ac352c529c63ce0698c1ddd5c.tar.xz kernel-qcow2-linux-44367877c6c5048ac352c529c63ce0698c1ddd5c.zip | |
staging: rtl8712: remove duplicate struct
struct ndis_wlan_bssid_ex is a doppelganger of struct wlan_bssid_ex,
and is used about a third as often.
Switch all instances to wlan_bssid_ex, and remove ndis_wlan_bssid_ex
This also gets rid of a use of typedef NDIS_802_11_RATES_EX
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8712/wlan_bssdef.h')
| -rw-r--r-- | drivers/staging/rtl8712/wlan_bssdef.h | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h index 8c5d6e7f82d2..cd3e62a20161 100644 --- a/drivers/staging/rtl8712/wlan_bssdef.h +++ b/drivers/staging/rtl8712/wlan_bssdef.h @@ -83,7 +83,7 @@ struct NDIS_802_11_FIXED_IEs { u16 Capabilities; }; -struct ndis_wlan_bssid_ex { +struct wlan_bssid_ex { u32 Length; unsigned char MacAddress[6]; u8 Reserved[2]; @@ -203,7 +203,7 @@ struct wlan_network { unsigned int last_scanned; /*timestamp for the network */ int aid; /*will only be valid when a BSS is joined. */ int join_res; - struct ndis_wlan_bssid_ex network; /*must be the last item */ + struct wlan_bssid_ex network; /*must be the last item */ }; enum VRTL_CARRIER_SENSE { @@ -234,24 +234,5 @@ enum UAPSD_MAX_SP { #define NUM_PRE_AUTH_KEY 16 #define NUM_PMKID_CACHE NUM_PRE_AUTH_KEY -/* - * WPA2 - */ -struct wlan_bssid_ex { - u32 Length; - unsigned char MacAddress[6]; - u8 Reserved[2]; - struct ndis_802_11_ssid Ssid; - u32 Privacy; - s32 Rssi; - enum NDIS_802_11_NETWORK_TYPE NetworkTypeInUse; - struct NDIS_802_11_CONFIGURATION Configuration; - enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode; - NDIS_802_11_RATES_EX SupportedRates; - u32 IELength; - u8 IEs[MAX_IE_SZ]; /* (timestamp, beacon interval, and capability - * information) */ -}; - #endif /* #ifndef WLAN_BSSDEF_H_ */ |