staging: rtl8712: remove duplicate struct
PATCH 3/5 staging: rtl8712: remove duplicate struct
struct ndis_wlan_bssid_ex is a dopelganger of struct wlan_bssid_ex, and is used about a third as often
Switch all instances to wlan_bssid_ex
This also gets rid of a use of typedef NDIS_802_11_RATES_EX
--- drivers/staging/rtl8712/rtl871x_cmd.c | 17 ++++++------- drivers/staging/rtl8712/rtl871x_cmd.h | 4 +-- drivers/staging/rtl8712/rtl871x_event.h | 2 +- drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 10 ++++---- drivers/staging/rtl8712/rtl871x_mlme.c | 35 +++++++++++++-------------- drivers/staging/rtl8712/rtl871x_mlme.h | 2 +- drivers/staging/rtl8712/rtl871x_mp_ioctl.c | 6 ++--- drivers/staging/rtl8712/wlan_bssdef.h | 23 ++---------------- 8 files changed, 38 insertions(+), 61 deletions(-)
(quoted diff) +0 -0
b/drivers/staging/rtl8712/rtl871x_cmd.c
index f07050d..ef71829 100644
drivers/staging/rtl8712/rtl871x_cmd.c +1 -3
@@ -456,9 +456,7 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)INIT_LIST_HEAD (&pcmd->list); pcmd->cmdcode = _CreateBss_CMD_; pcmd->parmbuf = (unsigned char *)pdev_network; - pcmd->cmdsz =r8712_get_ndis_wlan_bssid_ex_sz (( -struct ndis_wlan_bssid_ex *) - pdev_network); + pcmd->cmdsz =r8712_get_wlan_bssid_ex_sz (pdev_network); pcmd->rsp =NULL ; pcmd->rspsz =0 ;/* notes: translate IELength & Length after assign to cmdsz; */
@@ -471,7 +469,7 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network
*pnetwork)
{
- struct ndis_wlan_bssid_ex *psecnetwork;
+ struct wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@@ -502,7 +500,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
break;
}
}
- psecnetwork = (struct ndis_wlan_bssid_ex *)&psecuritypriv->sec_bss;
+ psecnetwork = &psecuritypriv->sec_bss;
if (psecnetwork == NULL) {
kfree(pcmd);
return _FAIL;
@@ -566,7 +564,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
memcpy(&psecuritypriv->supplicant_ie[1], &psecnetwork->IEs[0],
255);
/* get cmdsz before endian conversion */
- pcmd->cmdsz = r8712_get_ndis_wlan_bssid_ex_sz(psecnetwork);
+ pcmd->cmdsz = r8712_get_wlan_bssid_ex_sz(psecnetwork);
#ifdef __BIG_ENDIAN
/* wlan_network endian conversion */
psecnetwork->Length = cpu_to_le32(psecnetwork->Length);
@@ -894,8 +892,7 @@ void r8712_createbss_cmd_callback(struct _adapter *padapter,
struct sta_info *psta = NULL;
struct wlan_network *pwlan = NULL;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
- struct ndis_wlan_bssid_ex *pnetwork = (struct ndis_wlan_bssid_ex *)
- pcmd->parmbuf;
+ struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)pcmd->parmbuf;
struct wlan_network *tgt_network = &(pmlmepriv->cur_network);
if (pcmd->res != H2C_SUCCESS)
@@ -949,11 +946,11 @@ void r8712_createbss_cmd_callback(struct _adapter *padapter,
} else
list_add_tail(&(pwlan->list),
&pmlmepriv->scanned_queue.queue);
- pnetwork->Length = r8712_get_ndis_wlan_bssid_ex_sz(pnetwork);
+ pnetwork->Length = r8712_get_wlan_bssid_ex_sz(pnetwork);
memcpy(&(pwlan->network), pnetwork, pnetwork->Length); pwlan->fixed = true; memcpy(&tgt_network->network, pnetwork,
- (r8712_get_ndis_wlan_bssid_ex_sz(pnetwork)));
+ (r8712_get_wlan_bssid_ex_sz(pnetwork)));
if (pmlmepriv->fw_state & _FW_UNDER_LINKING)
pmlmepriv->fw_state ^= _FW_UNDER_LINKING;
/* we will set _FW_LINKED when there is one more sat to
(quoted diff) +0 -0
b/drivers/staging/rtl8712/rtl871x_cmd.h
index cb8225b..8a91b80 100644
drivers/staging/rtl8712/rtl871x_cmd.h +2 -2
@@ -128,7 +128,7 @@ struct usb_suspend_parm {* Command Event Mode */ struct joinbss_parm { -struct ndis_wlan_bssid_ex network; +struct wlan_bssid_ex network; };/*
@@ -146,7 +146,7 @@ struct disconnect_parm {* Command Mode */ struct createbss_parm { -struct ndis_wlan_bssid_ex network; +struct wlan_bssid_ex network; };/*
(quoted diff) +0 -0
b/drivers/staging/rtl8712/rtl871x_event.h
index e03ee90..697c8d7 100644
drivers/staging/rtl8712/rtl871x_event.h +1 -1
@@ -36,7 +36,7 @@* Used to report a bss has been scanned */ struct survey_event { -struct ndis_wlan_bssid_ex bss; +struct wlan_bssid_ex bss; };/*
(quoted diff) +0 -0
b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 3388f97..4f5f69c 100644
drivers/staging/rtl8712/rtl871x_ioctl_linux.c +5 -5
@@ -634,7 +634,7 @@ static int r8711_wx_get_name(struct net_device *dev,char *p;u8 ht_cap = false;struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -struct ndis_wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network; +struct wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network;NDIS_802_11_RATES_EX *prates =NULL ; if (check_fwstate(pmlmepriv, _FW_LINKED|WIFI_ADHOC_MASTER_STATE) ==
@@ -723,7 +723,7 @@ static int r8711_wx_get_freq(struct net_device *dev, {struct _adapter *padapter =netdev_priv (dev);struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct ndis_wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network; +struct wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network;if (check_fwstate (pmlmepriv, _FW_LINKED) == true) { wrqu->freq.m = ieee80211_wlan_frequencies[
@@ -1111,7 +1111,7 @@ static int r8711_wx_get_wap(struct net_device *dev, {struct _adapter *padapter =netdev_priv (dev);struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct ndis_wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network; +struct wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network; wrqu->ap_addr.sa_family =ARPHRD_ETHER ; if (check_fwstate(pmlmepriv, _FW_LINKED | WIFI_ADHOC_MASTER_STATE |
@@ -1327,7 +1327,7 @@ static int r8711_wx_get_essid(struct net_device *dev, {struct _adapter *padapter =netdev_priv (dev);struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct ndis_wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network; +struct wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network;u32 len, ret =0 ;if (check_fwstate (pmlmepriv, _FW_LINKED|WIFI_ADHOC_MASTER_STATE )) {
@@ -1419,7 +1419,7 @@ static int r8711_wx_get_rate(struct net_device *dev, {struct _adapter *padapter =netdev_priv (dev);struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct ndis_wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network; +struct wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network;struct ieee80211_ht_cap *pht_capie;unsigned char rf_type = padapter->registrypriv.rf_config;int i;
(quoted diff) +0 -0
b/drivers/staging/rtl8712/rtl871x_mlme.c
index 6b3451f..fc5dbea 100644
drivers/staging/rtl8712/rtl871x_mlme.c +1 -1
@@ -208,7 +208,7 @@ void r8712_generate_random_ibss(u8 *pibss) pibss[5 ] = (u8)((curtime>>16 ) &0xff ); } -uint r8712_get_ndis_wlan_bssid_ex_sz (struct ndis_wlan_bssid_ex *bss) +uint r8712_get_wlan_bssid_ex_sz (struct wlan_bssid_ex *bss) {return sizeof (*bss) + bss->IELength -MAX_IE_SZ ; }
@@ -276,8 +276,8 @@ int r8712_is_same_ibss(struct _adapter *adapter, struct
wlan_network *pnetwork)
}
-static int is_same_network(struct ndis_wlan_bssid_ex *src,
- struct ndis_wlan_bssid_ex *dst)
+static int is_same_network(struct wlan_bssid_ex *src,
+ struct wlan_bssid_ex *dst)
{
u16 s_cap, d_cap;
@@ -322,8 +322,8 @@ struct wlan_network *r8712_get_oldest_wlan_network(
return oldest;
}
-static void update_network(struct ndis_wlan_bssid_ex *dst,
- struct ndis_wlan_bssid_ex *src,
+static void update_network(struct wlan_bssid_ex *dst,
+ struct wlan_bssid_ex *src,
struct _adapter *padapter)
{
u32 last_evm = 0, tmpVal;
@@ -356,11 +356,11 @@ static void update_network(struct ndis_wlan_bssid_ex *dst,
src->Rssi = padapter->recvpriv.signal;
} else
src->Rssi = (src->Rssi + dst->Rssi) / 2;
- memcpy((u8 *)dst, (u8 *)src, r8712_get_ndis_wlan_bssid_ex_sz(src));
+ memcpy((u8 *)dst, (u8 *)src, r8712_get_wlan_bssid_ex_sz(src));
}
static void update_current_network(struct _adapter *adapter,
- struct ndis_wlan_bssid_ex *pnetwork)
+ struct wlan_bssid_ex *pnetwork)
{
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
@@ -378,7 +378,7 @@ static void update_current_network(struct _adapter *adapter,
Caller must hold pmlmepriv->lock first.
*/
static void update_scanned_network(struct _adapter *adapter,
- struct ndis_wlan_bssid_ex *target)
+ struct wlan_bssid_ex *target)
{
struct list_head *plist, *phead;
@@ -416,7 +416,7 @@ static void update_scanned_network(struct _adapter *adapter,
target->Rssi = (pnetwork->network.Rssi +
target->Rssi) / 2;
memcpy(&pnetwork->network, target,
- r8712_get_ndis_wlan_bssid_ex_sz(target));
+ r8712_get_wlan_bssid_ex_sz(target));
pnetwork->last_scanned = jiffies;
} else {
/* Otherwise just pull from the free list */
@@ -424,7 +424,7 @@ static void update_scanned_network(struct _adapter *adapter,
pnetwork = alloc_network(pmlmepriv); if (pnetwork == NULL)
return;
- bssid_ex_sz = r8712_get_ndis_wlan_bssid_ex_sz(target);
+ bssid_ex_sz = r8712_get_wlan_bssid_ex_sz(target);
target->Length = bssid_ex_sz; memcpy(&pnetwork->network, target, bssid_ex_sz); list_add_tail(&pnetwork->list, &queue->queue);
@@ -441,7 +441,7 @@ static void update_scanned_network(struct _adapter *adapter,
}
static void rtl8711_add_network(struct _adapter *adapter,
- struct ndis_wlan_bssid_ex *pnetwork)
+ struct wlan_bssid_ex *pnetwork)
{
unsigned long irqL;
struct mlme_priv *pmlmepriv = &(((struct _adapter *)adapter)->mlmepriv);
@@ -497,10 +497,10 @@ void r8712_survey_event_callback(struct _adapter *adapter, u8 *pbuf)
{
unsigned long flags;
u32 len;
- struct ndis_wlan_bssid_ex *pnetwork;
+ struct wlan_bssid_ex *pnetwork;
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
- pnetwork = (struct ndis_wlan_bssid_ex *)pbuf;
+ pnetwork = (struct wlan_bssid_ex *)pbuf;
#ifdef __BIG_ENDIAN
/* endian_convert */
pnetwork->Length = le32_to_cpu(pnetwork->Length);
@@ -528,7 +528,7 @@ void r8712_survey_event_callback(struct _adapter *adapter, u8 *pbuf)
le32_to_cpu(pnetwork->InfrastructureMode);
pnetwork->IELength = le32_to_cpu(pnetwork->IELength);
#endif
- len = r8712_get_ndis_wlan_bssid_ex_sz(pnetwork);
+ len = r8712_get_wlan_bssid_ex_sz(pnetwork);
if (len > sizeof(struct wlan_bssid_ex))
return;
spin_lock_irqsave(&pmlmepriv->lock2, flags);
@@ -759,7 +759,7 @@ void r8712_joinbss_event_callback(struct _adapter *adapter, u8 *pbuf)
the_same_macaddr = !memcmp(pnetwork->network.MacAddress,
cur_network->network.MacAddress, ETH_ALEN);
pnetwork->network.Length =
- r8712_get_ndis_wlan_bssid_ex_sz(&pnetwork->network);
+ r8712_get_wlan_bssid_ex_sz(&pnetwork->network);
spin_lock_irqsave(&pmlmepriv->lock, irqL);
if (pnetwork->network.Length > sizeof(struct wlan_bssid_ex))
goto ignore_joinbss_callback;
@@ -991,7 +991,7 @@ void r8712_stadel_event_callback(struct _adapter *adapter, u8 *pbuf)
pdev_network = &(adapter->registrypriv.dev_network); pibss = adapter->registrypriv.dev_network.MacAddress; memcpy(pdev_network, &tgt_network->network,
- r8712_get_ndis_wlan_bssid_ex_sz(&tgt_network->
+ r8712_get_wlan_bssid_ex_sz(&tgt_network->
network));
memcpy(&pdev_network->Ssid,
&pmlmepriv->assoc_ssid,
@@ -1658,8 +1658,7 @@ void r8712_update_registrypriv_dev_network(struct _adapter *adapter)
*/
sz = r8712_generate_ie(pregistrypriv); pdev_network->IELength = sz;
- pdev_network->Length = r8712_get_ndis_wlan_bssid_ex_sz(
- (struct ndis_wlan_bssid_ex *)pdev_network);
+ pdev_network->Length = r8712_get_wlan_bssid_ex_sz(pdev_network);
}
/*the function is at passive_level*/
(quoted diff) +0 -0
b/drivers/staging/rtl8712/rtl871x_mlme.h
index 42bd0bf..08d6c98 100644
drivers/staging/rtl8712/rtl871x_mlme.h +1 -1
@@ -202,7 +202,7 @@ sint r8712_set_key(struct _adapter *adapter, struct security_priv *psecuritypriv, sint keyid);sint r8712_set_auth (struct _adapter *adapter,struct security_priv *psecuritypriv); -uint r8712_get_ndis_wlan_bssid_ex_sz (struct ndis_wlan_bssid_ex *bss); +uint r8712_get_wlan_bssid_ex_sz (struct wlan_bssid_ex *bss);void r8712_generate_random_ibss (u8 *pibss);u8 *r8712_get_capability_from_ie (u8 *ie); struct wlan_network *r8712_get_oldest_wlan_network(
(quoted diff) +0 -0
b/drivers/staging/rtl8712/rtl871x_mp_ioctl.c
index 0b54612..77f01bf 100644
drivers/staging/rtl8712/rtl871x_mp_ioctl.c +3 -3
@@ -160,13 +160,13 @@ static int mp_start_test(struct _adapter *padapter)struct mp_priv *pmppriv = &padapter->mppriv;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct wlan_network *tgt_network = &pmlmepriv->cur_network; -struct ndis_wlan_bssid_ex bssid; +struct wlan_bssid_ex bssid;struct sta_info *psta;unsigned long length;unsigned long irqL;int res = _SUCCESS; -/* 3 1. initialize a new struct ndis_wlan_bssid_ex */ +/* 3 1. initialize a new struct wlan_bssid_ex */ memcpy (bssid.MacAddress, pmppriv->network_macaddr,ETH_ALEN ); bssid.Ssid.SsidLength =16 ; memcpy(bssid.Ssid.Ssid, (unsigned char *)"mp_pseudo_adhoc",
@@ -174,7 +174,7 @@ static int mp_start_test(struct _adapter *padapter) bssid.InfrastructureMode = Ndis802_11IBSS; bssid.NetworkTypeInUse = Ndis802_11DS; bssid.IELength =0 ; - length =r8712_get_ndis_wlan_bssid_ex_sz (&bssid); + length =r8712_get_wlan_bssid_ex_sz (&bssid);if (length %4 ) {/*round up to multiple of 4 bytes.*/ bssid.Length = ((length >>2 ) +1 ) <<2 ;
(quoted diff) +0 -0
b/drivers/staging/rtl8712/wlan_bssdef.h
index 2ea8a3d..7d769e8 100644
drivers/staging/rtl8712/wlan_bssdef.h +2 -21
@@ -94,7 +94,7 @@ struct NDIS_802_11_FIXED_IEs {* define a macro to present the partial sum. */ -struct ndis_wlan_bssid_ex { +struct wlan_bssid_ex {u32 Length;unsigned char MacAddress[6 ];u8 Reserved[2 ];
@@ -213,7 +213,7 @@ struct wlan_network {unsigned int last_scanned;/*timestamp for the network */ int aid;/*will only be valid when a BSS is joined. */ int join_res; -struct ndis_wlan_bssid_ex network;/*must be the last item */ +struct wlan_bssid_ex network;/*must be the last item */ };enum VRTL_CARRIER_SENSE {
@@ -244,24 +244,5 @@ enum UAPSD_MAX_SP {#define NUM_PRE_AUTH_KEY 16#define NUM_PMKID_CACHE NUM_PRE_AUTH_KEY -/* -* WPA2 -*/ -struct wlan_bssid_ex { -u32 Length; -unsigned char MacAddress[6 ]; -u8 Reserved[2 ]; -struct ndis_802_11_ssid Ssid; -u32 Privacy; -s32 Rssi; -enum NDIS_802_11_NETWORK_TYPE NetworkTypeInUse; -struct NDIS_802_11_CONFIGURATION Configuration; -enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode; -NDIS_802_11_RATES_EX SupportedRates; -u32 IELength; -u8 IEs[MAX_IE_SZ ];/* (timestamp, beacon interval, and capability -* information) */ -}; -#endif /* #ifndef WLAN_BSSDEF_H_ */
Signature · 1 line
2.4.6
Quoted 9 lines · Joshua Clayton
struct
ndis_wlan_bssid_exis a dopelganger of structwlan_bssid_ex, and is used about a third as oftenSwitch all instances to
wlan_bssid_exThis also gets rid of a use of typedef
NDIS_802_11_RATES_EXSigned-off-by Joshua Clayton <[email protected]>---
This patch seems to be corrupted. Did you try to edit the patch?
regards
sudip
Quoted 8 lines · Sudip Mukherjee
Quoted 7 lines · Joshua Clayton
struct
ndis_wlan_bssid_exis a dopelganger of structwlan_bssid_ex, and is used about a third as oftenSwitch all instances to
wlan_bssid_exThis also gets rid of a use of typedef
NDIS_802_11_RATES_EX
Quoted 7 lines
Quoted 2 lines
Signed-off-by Joshua Clayton <[email protected]>---
This patch seems to be corrupted. Did you try to edit the patch?
regards
sudip
I did not manually edit it as far as I know.
However, git-send-email (which sent the cover letter and patches 1,2,4, and 5), died every time I try to send this patch.
I opened it with kmail and it seemed to send successfully Perhaps there is something in the patch, or its size that trips up the smtp server.
Here it is as an attachment
Quoted 1 line
From
c0adcc2aa0f82708e0f4594d9d9f9b63cfbdf39dMon Sep 17 00:00:00 2001
From: Joshua Clayton <[email protected]>
Date: Thu, 23 Jul 2015 18:12:02 -0700
Subject: [PATCH 3/5] staging: rtl8712: remove duplicate struct
struct ndis_wlan_bssid_ex is a dopelganger of struct wlan_bssid_ex, and is used about a third as often
Switch all instances to wlan_bssid_ex
This also gets rid of a use of typedef NDIS_802_11_RATES_EX
--- drivers/staging/rtl8712/rtl871x_cmd.c | 17 ++++++------- drivers/staging/rtl8712/rtl871x_cmd.h | 4 +-- drivers/staging/rtl8712/rtl871x_event.h | 2 +- drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 10 ++++---- drivers/staging/rtl8712/rtl871x_mlme.c | 35 +++++++++++++-------------- drivers/staging/rtl8712/rtl871x_mlme.h | 2 +- drivers/staging/rtl8712/rtl871x_mp_ioctl.c | 6 ++--- drivers/staging/rtl8712/wlan_bssdef.h | 23 ++---------------- 8 files changed, 38 insertions(+), 61 deletions(-)
drivers/staging/rtl8712/rtl871x_cmd.c +7 -10
@@ -456,9 +456,7 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)INIT_LIST_HEAD (&pcmd->list); pcmd->cmdcode = _CreateBss_CMD_; pcmd->parmbuf = (unsigned char *)pdev_network; - pcmd->cmdsz =r8712_get_ndis_wlan_bssid_ex_sz (( -struct ndis_wlan_bssid_ex *) - pdev_network); + pcmd->cmdsz =r8712_get_wlan_bssid_ex_sz (pdev_network); pcmd->rsp =NULL ; pcmd->rspsz =0 ;/* notes: translate IELength & Length after assign to cmdsz; */
@@ -471,7 +469,7 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)u8 r8712_joinbss_cmd (struct _adapter *padapter,struct wlan_network *pnetwork) { -struct ndis_wlan_bssid_ex *psecnetwork; +struct wlan_bssid_ex *psecnetwork;struct cmd_obj *pcmd;struct cmd_priv *pcmdpriv = &padapter->cmdpriv;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@@ -502,7 +500,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)break ; } } - psecnetwork = (struct ndis_wlan_bssid_ex *)&psecuritypriv->sec_bss; + psecnetwork = &psecuritypriv->sec_bss;if (psecnetwork ==NULL ) {kfree (pcmd);return _FAIL;
@@ -566,7 +564,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)memcpy (&psecuritypriv->supplicant_ie[1 ], &psecnetwork->IEs[0 ],255 );/* get cmdsz before endian conversion */ - pcmd->cmdsz =r8712_get_ndis_wlan_bssid_ex_sz (psecnetwork); + pcmd->cmdsz =r8712_get_wlan_bssid_ex_sz (psecnetwork);#ifdef __BIG_ENDIAN/* wlan_network endian conversion */ psecnetwork->Length =cpu_to_le32 (psecnetwork->Length);
@@ -894,8 +892,7 @@ void r8712_createbss_cmd_callback(struct _adapter *padapter,struct sta_info *psta =NULL ;struct wlan_network *pwlan =NULL ;struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct ndis_wlan_bssid_ex *pnetwork = (struct ndis_wlan_bssid_ex *) - pcmd->parmbuf; +struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)pcmd->parmbuf;struct wlan_network *tgt_network = &(pmlmepriv->cur_network);if (pcmd->res !=H2C_SUCCESS )
@@ -949,11 +946,11 @@ void r8712_createbss_cmd_callback(struct _adapter *padapter, }else list_add_tail (&(pwlan->list), &pmlmepriv->scanned_queue.queue); - pnetwork->Length =r8712_get_ndis_wlan_bssid_ex_sz (pnetwork); + pnetwork->Length =r8712_get_wlan_bssid_ex_sz (pnetwork);memcpy (&(pwlan->network), pnetwork, pnetwork->Length); pwlan->fixed = true;memcpy (&tgt_network->network, pnetwork, - (r8712_get_ndis_wlan_bssid_ex_sz (pnetwork))); + (r8712_get_wlan_bssid_ex_sz (pnetwork)));if (pmlmepriv->fw_state & _FW_UNDER_LINKING) pmlmepriv->fw_state ^= _FW_UNDER_LINKING;/* we will set _FW_LINKED when there is one more sat to
drivers/staging/rtl8712/rtl871x_cmd.h +2 -2
@@ -128,7 +128,7 @@ struct usb_suspend_parm {* Command Event Mode */ struct joinbss_parm { -struct ndis_wlan_bssid_ex network; +struct wlan_bssid_ex network; };/*
@@ -146,7 +146,7 @@ struct disconnect_parm {* Command Mode */ struct createbss_parm { -struct ndis_wlan_bssid_ex network; +struct wlan_bssid_ex network; };/*
drivers/staging/rtl8712/rtl871x_event.h +1 -1
@@ -36,7 +36,7 @@* Used to report a bss has been scanned */ struct survey_event { -struct ndis_wlan_bssid_ex bss; +struct wlan_bssid_ex bss; };/*
drivers/staging/rtl8712/rtl871x_ioctl_linux.c +5 -5
@@ -634,7 +634,7 @@ static int r8711_wx_get_name(struct net_device *dev,char *p;u8 ht_cap = false;struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -struct ndis_wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network; +struct wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network;NDIS_802_11_RATES_EX *prates =NULL ; if (check_fwstate(pmlmepriv, _FW_LINKED|WIFI_ADHOC_MASTER_STATE) ==
@@ -723,7 +723,7 @@ static int r8711_wx_get_freq(struct net_device *dev, {struct _adapter *padapter =netdev_priv (dev);struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct ndis_wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network; +struct wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network;if (check_fwstate (pmlmepriv, _FW_LINKED) == true) { wrqu->freq.m = ieee80211_wlan_frequencies[
@@ -1111,7 +1111,7 @@ static int r8711_wx_get_wap(struct net_device *dev, {struct _adapter *padapter =netdev_priv (dev);struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct ndis_wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network; +struct wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network; wrqu->ap_addr.sa_family =ARPHRD_ETHER ; if (check_fwstate(pmlmepriv, _FW_LINKED | WIFI_ADHOC_MASTER_STATE |
@@ -1327,7 +1327,7 @@ static int r8711_wx_get_essid(struct net_device *dev, {struct _adapter *padapter =netdev_priv (dev);struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct ndis_wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network; +struct wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network;u32 len, ret =0 ;if (check_fwstate (pmlmepriv, _FW_LINKED|WIFI_ADHOC_MASTER_STATE )) {
@@ -1419,7 +1419,7 @@ static int r8711_wx_get_rate(struct net_device *dev, {struct _adapter *padapter =netdev_priv (dev);struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct ndis_wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network; +struct wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network;struct ieee80211_ht_cap *pht_capie;unsigned char rf_type = padapter->registrypriv.rf_config;int i;
drivers/staging/rtl8712/rtl871x_mlme.c +17 -18
@@ -208,7 +208,7 @@ void r8712_generate_random_ibss(u8 *pibss) pibss[5 ] = (u8)((curtime>>16 ) &0xff ); } -uint r8712_get_ndis_wlan_bssid_ex_sz (struct ndis_wlan_bssid_ex *bss) +uint r8712_get_wlan_bssid_ex_sz (struct wlan_bssid_ex *bss) {return sizeof (*bss) + bss->IELength -MAX_IE_SZ ; }
@@ -276,8 +276,8 @@ int r8712_is_same_ibss(struct _adapter *adapter, struct wlan_network *pnetwork) } -static int is_same_network (struct ndis_wlan_bssid_ex *src, -struct ndis_wlan_bssid_ex *dst) +static int is_same_network (struct wlan_bssid_ex *src, +struct wlan_bssid_ex *dst) {u16 s_cap, d_cap;
@@ -322,8 +322,8 @@ struct wlan_network *r8712_get_oldest_wlan_network(return oldest; } -static void update_network (struct ndis_wlan_bssid_ex *dst, -struct ndis_wlan_bssid_ex *src, +static void update_network (struct wlan_bssid_ex *dst, +struct wlan_bssid_ex *src,struct _adapter *padapter) {u32 last_evm =0 , tmpVal;
@@ -356,11 +356,11 @@ static void update_network(struct ndis_wlan_bssid_ex *dst, src->Rssi = padapter->recvpriv.signal; }else src->Rssi = (src->Rssi + dst->Rssi) /2 ; -memcpy ((u8 *)dst, (u8 *)src,r8712_get_ndis_wlan_bssid_ex_sz (src)); +memcpy ((u8 *)dst, (u8 *)src,r8712_get_wlan_bssid_ex_sz (src)); }static void update_current_network (struct _adapter *adapter, -struct ndis_wlan_bssid_ex *pnetwork) +struct wlan_bssid_ex *pnetwork) {struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
@@ -378,7 +378,7 @@ static void update_current_network(struct _adapter *adapter,Caller must hold pmlmepriv->lock first. */ static void update_scanned_network (struct _adapter *adapter, -struct ndis_wlan_bssid_ex *target) +struct wlan_bssid_ex *target) {struct list_head *plist, *phead;
@@ -416,7 +416,7 @@ static void update_scanned_network(struct _adapter *adapter, target->Rssi = (pnetwork->network.Rssi + target->Rssi) /2 ;memcpy (&pnetwork->network, target, -r8712_get_ndis_wlan_bssid_ex_sz (target)); +r8712_get_wlan_bssid_ex_sz (target)); pnetwork->last_scanned = jiffies; }else {/* Otherwise just pull from the free list */
@@ -424,7 +424,7 @@ static void update_scanned_network(struct _adapter *adapter, pnetwork =alloc_network (pmlmepriv);if (pnetwork ==NULL )return ; - bssid_ex_sz =r8712_get_ndis_wlan_bssid_ex_sz (target); + bssid_ex_sz =r8712_get_wlan_bssid_ex_sz (target); target->Length = bssid_ex_sz;memcpy (&pnetwork->network, target, bssid_ex_sz);list_add_tail (&pnetwork->list, &queue->queue);
@@ -441,7 +441,7 @@ static void update_scanned_network(struct _adapter *adapter, }static void rtl8711_add_network (struct _adapter *adapter, -struct ndis_wlan_bssid_ex *pnetwork) +struct wlan_bssid_ex *pnetwork) {unsigned long irqL;struct mlme_priv *pmlmepriv = &(((struct _adapter *)adapter)->mlmepriv);
@@ -497,10 +497,10 @@ void r8712_survey_event_callback(struct _adapter *adapter, u8 *pbuf) {unsigned long flags;u32 len; -struct ndis_wlan_bssid_ex *pnetwork; +struct wlan_bssid_ex *pnetwork;struct mlme_priv *pmlmepriv = &adapter->mlmepriv; - pnetwork = (struct ndis_wlan_bssid_ex *)pbuf; + pnetwork = (struct wlan_bssid_ex *)pbuf;#ifdef __BIG_ENDIAN/* endian_convert */ pnetwork->Length =le32_to_cpu (pnetwork->Length);
@@ -528,7 +528,7 @@ void r8712_survey_event_callback(struct _adapter *adapter, u8 *pbuf)le32_to_cpu (pnetwork->InfrastructureMode); pnetwork->IELength =le32_to_cpu (pnetwork->IELength);#endif - len =r8712_get_ndis_wlan_bssid_ex_sz (pnetwork); + len =r8712_get_wlan_bssid_ex_sz (pnetwork);if (len >sizeof (struct wlan_bssid_ex ))return ;spin_lock_irqsave (&pmlmepriv->lock2, flags);
@@ -759,7 +759,7 @@ void r8712_joinbss_event_callback(struct _adapter *adapter, u8 *pbuf) the_same_macaddr = !memcmp (pnetwork->network.MacAddress, cur_network->network.MacAddress,ETH_ALEN ); pnetwork->network.Length = -r8712_get_ndis_wlan_bssid_ex_sz (&pnetwork->network); +r8712_get_wlan_bssid_ex_sz (&pnetwork->network);spin_lock_irqsave (&pmlmepriv->lock, irqL);if (pnetwork->network.Length >sizeof (struct wlan_bssid_ex )) goto ignore_joinbss_callback;
@@ -991,7 +991,7 @@ void r8712_stadel_event_callback(struct _adapter *adapter, u8 *pbuf) pdev_network = &(adapter->registrypriv.dev_network); pibss = adapter->registrypriv.dev_network.MacAddress;memcpy (pdev_network, &tgt_network->network, -r8712_get_ndis_wlan_bssid_ex_sz (&tgt_network-> +r8712_get_wlan_bssid_ex_sz (&tgt_network-> network)); memcpy(&pdev_network->Ssid, &pmlmepriv->assoc_ssid,
@@ -1658,8 +1658,7 @@ void r8712_update_registrypriv_dev_network(struct _adapter *adapter)*/ sz =r8712_generate_ie (pregistrypriv); pdev_network->IELength = sz; - pdev_network->Length =r8712_get_ndis_wlan_bssid_ex_sz ( - (struct ndis_wlan_bssid_ex *)pdev_network); + pdev_network->Length =r8712_get_wlan_bssid_ex_sz (pdev_network); }/*the function is at passive_level*/
drivers/staging/rtl8712/rtl871x_mlme.h +1 -1
@@ -202,7 +202,7 @@ sint r8712_set_key(struct _adapter *adapter, struct security_priv *psecuritypriv, sint keyid);sint r8712_set_auth (struct _adapter *adapter,struct security_priv *psecuritypriv); -uint r8712_get_ndis_wlan_bssid_ex_sz (struct ndis_wlan_bssid_ex *bss); +uint r8712_get_wlan_bssid_ex_sz (struct wlan_bssid_ex *bss);void r8712_generate_random_ibss (u8 *pibss);u8 *r8712_get_capability_from_ie (u8 *ie); struct wlan_network *r8712_get_oldest_wlan_network(
drivers/staging/rtl8712/rtl871x_mp_ioctl.c +3 -3
@@ -160,13 +160,13 @@ static int mp_start_test(struct _adapter *padapter)struct mp_priv *pmppriv = &padapter->mppriv;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct wlan_network *tgt_network = &pmlmepriv->cur_network; -struct ndis_wlan_bssid_ex bssid; +struct wlan_bssid_ex bssid;struct sta_info *psta;unsigned long length;unsigned long irqL;int res = _SUCCESS; -/* 3 1. initialize a new struct ndis_wlan_bssid_ex */ +/* 3 1. initialize a new struct wlan_bssid_ex */ memcpy (bssid.MacAddress, pmppriv->network_macaddr,ETH_ALEN ); bssid.Ssid.SsidLength =16 ; memcpy(bssid.Ssid.Ssid, (unsigned char *)"mp_pseudo_adhoc",
@@ -174,7 +174,7 @@ static int mp_start_test(struct _adapter *padapter) bssid.InfrastructureMode = Ndis802_11IBSS; bssid.NetworkTypeInUse = Ndis802_11DS; bssid.IELength =0 ; - length =r8712_get_ndis_wlan_bssid_ex_sz (&bssid); + length =r8712_get_wlan_bssid_ex_sz (&bssid);if (length %4 ) {/*round up to multiple of 4 bytes.*/ bssid.Length = ((length >>2 ) +1 ) <<2 ;
drivers/staging/rtl8712/wlan_bssdef.h +2 -21
@@ -94,7 +94,7 @@ struct NDIS_802_11_FIXED_IEs {* define a macro to present the partial sum. */ -struct ndis_wlan_bssid_ex { +struct wlan_bssid_ex {u32 Length;unsigned char MacAddress[6 ];u8 Reserved[2 ];
@@ -213,7 +213,7 @@ struct wlan_network {unsigned int last_scanned;/*timestamp for the network */ int aid;/*will only be valid when a BSS is joined. */ int join_res; -struct ndis_wlan_bssid_ex network;/*must be the last item */ +struct wlan_bssid_ex network;/*must be the last item */ };enum VRTL_CARRIER_SENSE {
@@ -244,24 +244,5 @@ enum UAPSD_MAX_SP {#define NUM_PRE_AUTH_KEY 16#define NUM_PMKID_CACHE NUM_PRE_AUTH_KEY -/* -* WPA2 -*/ -struct wlan_bssid_ex { -u32 Length; -unsigned char MacAddress[6 ]; -u8 Reserved[2 ]; -struct ndis_802_11_ssid Ssid; -u32 Privacy; -s32 Rssi; -enum NDIS_802_11_NETWORK_TYPE NetworkTypeInUse; -struct NDIS_802_11_CONFIGURATION Configuration; -enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode; -NDIS_802_11_RATES_EX SupportedRates; -u32 IELength; -u8 IEs[MAX_IE_SZ ];/* (timestamp, beacon interval, and capability -* information) */ -}; -#endif /* #ifndef WLAN_BSSDEF_H_ */
Signature · 1 line
2.4.6
Quoted 14 lines · Joshua Clayton
Quoted 13 lines · Sudip Mukherjee
Quoted 9 lines · Joshua Clayton
struct
ndis_wlan_bssid_exis a dopelganger of structwlan_bssid_ex, and is used about a third as oftenSwitch all instances to
wlan_bssid_exThis also gets rid of a use of typedef
NDIS_802_11_RATES_EXSigned-off-by Joshua Clayton <[email protected]>---
This patch seems to be corrupted. Did you try to edit the patch?
Quoted 9 lines
Quoted 2 lines
regards
sudipI did not manually edit it as far as I know.
However, git-send-email (which sent the cover letter and patches 1,2,4, and 5), died every time I try to send this patch.
I opened it with kmail and it seemed to send successfully Perhaps there is something in the patch, or its size that trips up the smtp server.
kmail will screw up your patches. There is a Kmail section in Documentation/email-clients.txt.
Anyway, just figure it out and resend the entire series. Don't send attachments. We are not in a rush.
regards,
dan carpenter
Greg Kroah-Hartman
maintainerQuoted 37 lines · Joshua Clayton
struct
ndis_wlan_bssid_exis a dopelganger of structwlan_bssid_ex, and is used about a third as oftenSwitch all instances to
wlan_bssid_exThis also gets rid of a use of typedef
NDIS_802_11_RATES_EXSigned-off-by Joshua Clayton <[email protected]>--- drivers/staging/rtl8712/rtl871x_cmd.c | 17 ++++++------- drivers/staging/rtl8712/rtl871x_cmd.h | 4 +-- drivers/staging/rtl8712/rtl871x_event.h | 2 +- drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 10 ++++---- drivers/staging/rtl8712/rtl871x_mlme.c | 35 +++++++++++++-------------- drivers/staging/rtl8712/rtl871x_mlme.h | 2 +- drivers/staging/rtl8712/rtl871x_mp_ioctl.c | 6 ++--- drivers/staging/rtl8712/wlan_bssdef.h | 23 ++---------------- 8 files changed, 38 insertions(+), 61 deletions(-)drivers/staging/rtl8712/rtl871x_cmd.c +1
-3@@ -456,9 +456,7 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)INIT_LIST_HEAD (&pcmd->list); pcmd->cmdcode = _CreateBss_CMD_; pcmd->parmbuf = (unsigned char *)pdev_network; - pcmd->cmdsz =r8712_get_ndis_wlan_bssid_ex_sz (( -struct ndis_wlan_bssid_ex *) - pdev_network); + pcmd->cmdsz =r8712_get_wlan_bssid_ex_sz (pdev_network); pcmd->rsp =NULL ; pcmd->rspsz =0 ;/* notes: translate IELength & Length after assign to cmdsz; */
drivers/staging/rtl8712/rtl871x_cmd.c u8 r8712_createbss_cmd(struct _adapter *padapter) · line 471
Quoted 3 lines
drivers/staging/rtl8712/rtl871x_cmd.c +0
-0@@ -471,7 +469,7 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)u8 r8712_joinbss_cmd (struct _adapter *padapter,struct wlan_network *pnetwork)
Patch is line-wrapped and can not be applied :(
Can you redo this whole series and resend properly? Your 0/5 email needs a subject as well...
thanks,
greg k-h