Commit db55b165 authored by Joshua Clayton's avatar Joshua Clayton Committed by Greg Kroah-Hartman

staging: rtl8712: remove typedefs

Coding style fix.
Get rid of typedefs NDIS_802_11_RATES and NDIS_802_11_RATES_EX
Undo any casting that was done as a result of the typedef.
Signed-off-by: default avatarJoshua Clayton <stillcompiling@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 986fc8e7
...@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter, ...@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
} }
/* Add the protocol name */ /* Add the protocol name */
iwe.cmd = SIOCGIWNAME; iwe.cmd = SIOCGIWNAME;
if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network. if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) { SupportedRates)) == true) {
if (ht_cap == true) if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn"); snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else else
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11b"); snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11b");
} else if ((r8712_is_cckrates_included((u8 *)&pnetwork->network. } else if ((r8712_is_cckrates_included(pnetwork->network.
SupportedRates)) == true) { SupportedRates)) == true) {
if (ht_cap == true) if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn"); snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
...@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev, ...@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false; u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network; struct wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network;
NDIS_802_11_RATES_EX *prates = NULL; u8 *prates;
if (check_fwstate(pmlmepriv, _FW_LINKED|WIFI_ADHOC_MASTER_STATE) == if (check_fwstate(pmlmepriv, _FW_LINKED|WIFI_ADHOC_MASTER_STATE) ==
true) { true) {
...@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev, ...@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12); &ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0) if (p && ht_ielen > 0)
ht_cap = true; ht_cap = true;
prates = &pcur_bss->SupportedRates; prates = pcur_bss->SupportedRates;
if (r8712_is_cckratesonly_included((u8 *)prates) == true) { if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true) if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ, snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn"); "IEEE 802.11bn");
else else
snprintf(wrqu->name, IFNAMSIZ, snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b"); "IEEE 802.11b");
} else if ((r8712_is_cckrates_included((u8 *)prates)) == true) { } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true) if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ, snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn"); "IEEE 802.11bgn");
......
...@@ -32,11 +32,6 @@ ...@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8 #define NDIS_802_11_LENGTH_RATES 8
#define NDIS_802_11_LENGTH_RATES_EX 16 #define NDIS_802_11_LENGTH_RATES_EX 16
/* Set of 8 data rates*/
typedef unsigned char NDIS_802_11_RATES[NDIS_802_11_LENGTH_RATES];
/* Set of 16 data rates */
typedef unsigned char NDIS_802_11_RATES_EX[NDIS_802_11_LENGTH_RATES_EX];
struct ndis_802_11_ssid { struct ndis_802_11_ssid {
u32 SsidLength; u32 SsidLength;
u8 Ssid[32]; u8 Ssid[32];
...@@ -93,7 +88,7 @@ struct wlan_bssid_ex { ...@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
enum NDIS_802_11_NETWORK_TYPE NetworkTypeInUse; enum NDIS_802_11_NETWORK_TYPE NetworkTypeInUse;
struct NDIS_802_11_CONFIGURATION Configuration; struct NDIS_802_11_CONFIGURATION Configuration;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode; enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates; u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */ /* number of content bytes in EIs, which varies */
u32 IELength; u32 IELength;
/*(timestamp, beacon interval, and capability information) */ /*(timestamp, beacon interval, and capability information) */
......
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