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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
From: Joshua Clayton <stillcompiling@xxxxxxxxx>
To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>,
Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>,
Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>,
Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>,
Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>,
Joshua Clayton <stillcompiling@xxxxxxxxx>,
Vaishali Thakkar <vthakkar1994@xxxxxxxxx>,
Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>,
Daniel Baluta <daniel.baluta@xxxxxxxxx>,
Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>,
Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>,
Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>,
Cristina Opriceana <cristina.opriceana@xxxxxxxxx>,
Dogukan Ergun <dogukan.ergun@xxxxxxxxx>,
Julia Lawall <Julia.Lawall@xxxxxxx>,
Dan Carpenter <dan.carpenter@xxxxxxxxxx>,
Haneen Mohammed <hamohammed.sa@xxxxxxxxx>,
Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
Cc: devel@xxxxxxxxxxxxxxxxxxxx,
linux-kernel@xxxxxxxxxxxxxxx
Subject: [PATCH V3 7/8] staging: rtl8712: remove typedefs
Date: Mon, 27 Jul 2015 21:41:16 -0700
Message-Id: <cab9d5de1a7dada159f3bf2e1044ccc3fc831977.1438057939.git.stillcompiling@xxxxxxxxx>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
References: <cover.1438057939.git.stillcompiling@xxxxxxxxx>
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: Joshua Clayton <stillcompiling@xxxxxxxxx>
---
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 12 ++++++------
drivers/staging/rtl8712/wlan_bssdef.h | 7 +------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 4f5f69c..83d4bca 100644
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -203,13 +203,13 @@ static inline char *translate_scan(struct _adapter *padapter,
}
/* Add the protocol name */
iwe.cmd = SIOCGIWNAME;
- if ((r8712_is_cckratesonly_included((u8 *)&pnetwork->network.
+ if ((r8712_is_cckratesonly_included(pnetwork->network.
SupportedRates)) == true) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else
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) {
if (ht_cap == true)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
@@ -635,7 +635,7 @@ static int r8711_wx_get_name(struct net_device *dev,
u8 ht_cap = false;
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
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) ==
true) {
@@ -644,15 +644,15 @@ static int r8711_wx_get_name(struct net_device *dev,
&ht_ielen, pcur_bss->IELength - 12);
if (p && ht_ielen > 0)
ht_cap = true;
- prates = &pcur_bss->SupportedRates;
- if (r8712_is_cckratesonly_included((u8 *)prates) == true) {
+ prates = pcur_bss->SupportedRates;
+ if (r8712_is_cckratesonly_included(prates) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bn");
else
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11b");
- } else if ((r8712_is_cckrates_included((u8 *)prates)) == true) {
+ } else if ((r8712_is_cckrates_included(prates)) == true) {
if (ht_cap == true)
snprintf(wrqu->name, IFNAMSIZ,
"IEEE 802.11bgn");
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index cd3e62a..ff86fbd 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -32,11 +32,6 @@
#define NDIS_802_11_LENGTH_RATES 8
#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 {
u32 SsidLength;
u8 Ssid[32];
@@ -93,7 +88,7 @@ struct wlan_bssid_ex {
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;
+ u8 SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
/* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
--
2.4.6
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
