mirror of
https://github.com/lwfinger/rtl8188eu.git
synced 2024-11-22 04:23:39 +00:00
rtl8188eu: Remove CONFIG_80211D - defined
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
parent
d757702bfb
commit
712e0297fc
5 changed files with 13 additions and 35 deletions
|
@ -7874,7 +7874,6 @@ unsigned int receive_disconnect(_adapter *padapter, unsigned char *MacAddr, unsi
|
|||
return _SUCCESS;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_80211D
|
||||
static void process_80211d(PADAPTER padapter, WLAN_BSSID_EX *bssid)
|
||||
{
|
||||
struct registry_priv *pregistrypriv;
|
||||
|
@ -7889,8 +7888,7 @@ static void process_80211d(PADAPTER padapter, WLAN_BSSID_EX *bssid)
|
|||
|
||||
/* Adjust channel plan by AP Country IE */
|
||||
if (pregistrypriv->enable80211d &&
|
||||
(!pmlmeext->update_channel_plan_by_ap_done))
|
||||
{
|
||||
(!pmlmeext->update_channel_plan_by_ap_done)) {
|
||||
u8 *ie, *p;
|
||||
u32 len;
|
||||
RT_CHANNEL_PLAN chplan_ap;
|
||||
|
@ -7901,9 +7899,10 @@ static void process_80211d(PADAPTER padapter, WLAN_BSSID_EX *bssid)
|
|||
u8 j, k;
|
||||
|
||||
ie = rtw_get_ie(bssid->IEs + _FIXED_IE_LENGTH_, _COUNTRY_IE_, &len, bssid->IELength - _FIXED_IE_LENGTH_);
|
||||
if (!ie) return;
|
||||
if (len < 6) return;
|
||||
|
||||
if (!ie)
|
||||
return;
|
||||
if (len < 6)
|
||||
return;
|
||||
ie += 2;
|
||||
p = ie;
|
||||
ie += len;
|
||||
|
@ -7915,16 +7914,16 @@ static void process_80211d(PADAPTER padapter, WLAN_BSSID_EX *bssid)
|
|||
("%s: 802.11d country=%s\n", __func__, country));
|
||||
|
||||
i = 0;
|
||||
while ((ie - p) >= 3)
|
||||
{
|
||||
while ((ie - p) >= 3) {
|
||||
fcn = *(p++);
|
||||
noc = *(p++);
|
||||
p++;
|
||||
|
||||
for (j = 0; j < noc; j++)
|
||||
{
|
||||
if (fcn <= 14) channel = fcn + j; /* 2.4 GHz */
|
||||
else channel = fcn + j*4; /* 5 GHz */
|
||||
for (j = 0; j < noc; j++) {
|
||||
if (fcn <= 14)
|
||||
channel = fcn + j; /* 2.4 GHz */
|
||||
else
|
||||
channel = fcn + j*4; /* 5 GHz */
|
||||
|
||||
chplan_ap.Channel[i++] = channel;
|
||||
}
|
||||
|
@ -7934,8 +7933,7 @@ static void process_80211d(PADAPTER padapter, WLAN_BSSID_EX *bssid)
|
|||
#ifdef CONFIG_DEBUG_RTL871X
|
||||
i = 0;
|
||||
DBG_88E("%s: AP[%s] channel plan {", __func__, bssid->Ssid.Ssid);
|
||||
while ((i < chplan_ap.Len) && (chplan_ap.Channel[i] != 0))
|
||||
{
|
||||
while ((i < chplan_ap.Len) && (chplan_ap.Channel[i] != 0)) {
|
||||
DBG_88E("%02d,", chplan_ap.Channel[i]);
|
||||
i++;
|
||||
}
|
||||
|
@ -8139,7 +8137,6 @@ static void process_80211d(PADAPTER padapter, WLAN_BSSID_EX *bssid)
|
|||
i++;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
|
||||
|
@ -8201,16 +8198,13 @@ void report_survey_event(_adapter *padapter, union recv_frame *precv_frame)
|
|||
return;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_80211D
|
||||
process_80211d(padapter, &psurvey_evt->bss);
|
||||
#endif
|
||||
|
||||
rtw_enqueue_cmd(pcmdpriv, pcmd_obj);
|
||||
|
||||
pmlmeext->sitesurvey_res.bss_cnt++;
|
||||
|
||||
return;
|
||||
|
||||
}
|
||||
|
||||
void report_surveydone_event(_adapter *padapter)
|
||||
|
@ -8224,13 +8218,10 @@ void report_surveydone_event(_adapter *padapter)
|
|||
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
|
||||
|
||||
if ((pcmd_obj = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj))) == NULL)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
cmdsz = (sizeof(struct surveydone_event) + sizeof(struct C2HEvent_Header));
|
||||
if ((pevtcmd = (u8*)rtw_zmalloc(cmdsz)) == NULL)
|
||||
{
|
||||
if ((pevtcmd = (u8*)rtw_zmalloc(cmdsz)) == NULL) {
|
||||
rtw_mfree((u8 *)pcmd_obj, sizeof(struct cmd_obj));
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -113,8 +113,6 @@
|
|||
#define RATE_ADAPTIVE_SUPPORT 1
|
||||
#define POWER_TRAINING_ACTIVE 1
|
||||
|
||||
#define CONFIG_80211D
|
||||
|
||||
/*
|
||||
* Debug Related Config
|
||||
*/
|
||||
|
|
|
@ -169,9 +169,7 @@ struct registry_priv
|
|||
|
||||
u8 fw_iol; //enable iol without other concern
|
||||
|
||||
#ifdef CONFIG_80211D
|
||||
u8 enable80211d;
|
||||
#endif
|
||||
|
||||
u8 ifname[16];
|
||||
u8 if2name[16];
|
||||
|
@ -179,7 +177,6 @@ struct registry_priv
|
|||
u8 notch_filter;
|
||||
};
|
||||
|
||||
|
||||
//For registry parameters
|
||||
#define RGTRY_OFT(field) ((ULONG)FIELD_OFFSET(struct registry_priv,field))
|
||||
#define RGTRY_SZ(field) sizeof(((struct registry_priv*) 0)->field)
|
||||
|
|
|
@ -478,9 +478,7 @@ struct mlme_ext_priv
|
|||
unsigned char bstart_bss;
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_80211D
|
||||
u8 update_channel_plan_by_ap_done;
|
||||
#endif
|
||||
//recv_decache check for Action_public frame
|
||||
u8 action_public_dialog_token;
|
||||
u16 action_public_rxseq;
|
||||
|
|
|
@ -135,9 +135,7 @@ static int rtw_hw_wps_pbc = 1;
|
|||
|
||||
int rtw_mc2u_disable = 0;
|
||||
|
||||
#ifdef CONFIG_80211D
|
||||
static int rtw_80211d = 0;
|
||||
#endif
|
||||
|
||||
static char* ifname = "wlan%d";
|
||||
module_param(ifname, charp, 0644);
|
||||
|
@ -197,10 +195,8 @@ MODULE_PARM_DESC(rtw_fw_file_path, "The path of fw image");
|
|||
|
||||
module_param(rtw_mc2u_disable, int, 0644);
|
||||
|
||||
#ifdef CONFIG_80211D
|
||||
module_param(rtw_80211d, int, 0644);
|
||||
MODULE_PARM_DESC(rtw_80211d, "Enable 802.11d mechanism");
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_BT_COEXIST
|
||||
module_param(rtw_btcoex_enable, int, 0644);
|
||||
|
@ -687,9 +683,7 @@ _func_enter_;
|
|||
|
||||
registry_par->fw_iol = rtw_fw_iol;
|
||||
|
||||
#ifdef CONFIG_80211D
|
||||
registry_par->enable80211d = (u8)rtw_80211d;
|
||||
#endif
|
||||
snprintf(registry_par->ifname, 16, "%s", ifname);
|
||||
snprintf(registry_par->if2name, 16, "%s", if2name);
|
||||
registry_par->notch_filter = (u8)rtw_notch_filter;
|
||||
|
|
Loading…
Reference in a new issue