|
@@ -227,7 +227,7 @@ static void init_mlme_ext_priv_value(struct adapter *padapter)
|
|
|
pmlmeext->cur_channel = padapter->registrypriv.channel;
|
|
|
pmlmeext->cur_bwmode = HT_CHANNEL_WIDTH_20;
|
|
|
pmlmeext->cur_ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE;
|
|
|
- pmlmeext->oper_channel = pmlmeext->cur_channel ;
|
|
|
+ pmlmeext->oper_channel = pmlmeext->cur_channel;
|
|
|
pmlmeext->oper_bwmode = pmlmeext->cur_bwmode;
|
|
|
pmlmeext->oper_ch_offset = pmlmeext->cur_ch_offset;
|
|
|
pmlmeext->retry = 0;
|
|
@@ -2000,7 +2000,7 @@ void issue_beacon(struct adapter *padapter, int timeout_ms)
|
|
|
DBG_88E("%s, alloc mgnt frame fail\n", __func__);
|
|
|
return;
|
|
|
}
|
|
|
-#if defined (CONFIG_88EU_AP_MODE)
|
|
|
+#if defined(CONFIG_88EU_AP_MODE)
|
|
|
spin_lock_bh(&pmlmepriv->bcn_update_lock);
|
|
|
#endif /* if defined (CONFIG_88EU_AP_MODE) */
|
|
|
|
|
@@ -2027,7 +2027,7 @@ void issue_beacon(struct adapter *padapter, int timeout_ms)
|
|
|
SetFrameSubType(pframe, WIFI_BEACON);
|
|
|
|
|
|
pframe += sizeof(struct rtw_ieee80211_hdr_3addr);
|
|
|
- pattrib->pktlen = sizeof (struct rtw_ieee80211_hdr_3addr);
|
|
|
+ pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);
|
|
|
|
|
|
if ((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE) {
|
|
|
int len_diff;
|
|
@@ -2042,8 +2042,8 @@ void issue_beacon(struct adapter *padapter, int timeout_ms)
|
|
|
);
|
|
|
pframe += (cur_network->IELength+len_diff);
|
|
|
pattrib->pktlen += (cur_network->IELength+len_diff);
|
|
|
- wps_ie = rtw_get_wps_ie(pmgntframe->buf_addr+TXDESC_OFFSET+sizeof (struct rtw_ieee80211_hdr_3addr)+_BEACON_IE_OFFSET_,
|
|
|
- pattrib->pktlen-sizeof (struct rtw_ieee80211_hdr_3addr)-_BEACON_IE_OFFSET_, NULL, &wps_ielen);
|
|
|
+ wps_ie = rtw_get_wps_ie(pmgntframe->buf_addr+TXDESC_OFFSET+sizeof(struct rtw_ieee80211_hdr_3addr)+_BEACON_IE_OFFSET_,
|
|
|
+ pattrib->pktlen-sizeof(struct rtw_ieee80211_hdr_3addr)-_BEACON_IE_OFFSET_, NULL, &wps_ielen);
|
|
|
if (wps_ie && wps_ielen > 0)
|
|
|
rtw_get_wps_attr_content(wps_ie, wps_ielen, WPS_ATTR_SELECTED_REGISTRAR, (u8 *)(&sr), NULL);
|
|
|
if (sr != 0)
|
|
@@ -2101,7 +2101,7 @@ void issue_beacon(struct adapter *padapter, int timeout_ms)
|
|
|
/* todo:HT for adhoc */
|
|
|
_issue_bcn:
|
|
|
|
|
|
-#if defined (CONFIG_88EU_AP_MODE)
|
|
|
+#if defined(CONFIG_88EU_AP_MODE)
|
|
|
pmlmepriv->update_bcn = false;
|
|
|
|
|
|
spin_unlock_bh(&pmlmepriv->bcn_update_lock);
|
|
@@ -2130,7 +2130,7 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p
|
|
|
__le16 *fctrl;
|
|
|
unsigned char *mac, *bssid;
|
|
|
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
|
|
|
-#if defined (CONFIG_88EU_AP_MODE)
|
|
|
+#if defined(CONFIG_88EU_AP_MODE)
|
|
|
u8 *pwps_ie;
|
|
|
uint wps_ielen;
|
|
|
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
|
@@ -2323,8 +2323,8 @@ static int _issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *ps
|
|
|
pmlmeext->mgnt_seq++;
|
|
|
SetFrameSubType(pframe, WIFI_PROBEREQ);
|
|
|
|
|
|
- pframe += sizeof (struct rtw_ieee80211_hdr_3addr);
|
|
|
- pattrib->pktlen = sizeof (struct rtw_ieee80211_hdr_3addr);
|
|
|
+ pframe += sizeof(struct rtw_ieee80211_hdr_3addr);
|
|
|
+ pattrib->pktlen = sizeof(struct rtw_ieee80211_hdr_3addr);
|
|
|
|
|
|
if (pssid)
|
|
|
pframe = rtw_set_ie(pframe, _SSID_IE_, pssid->SsidLength, pssid->Ssid, &(pattrib->pktlen));
|
|
@@ -3209,7 +3209,7 @@ exit:
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
-void issue_action_spct_ch_switch (struct adapter *padapter, u8 *ra, u8 new_ch, u8 ch_offset)
|
|
|
+void issue_action_spct_ch_switch(struct adapter *padapter, u8 *ra, u8 new_ch, u8 ch_offset)
|
|
|
{
|
|
|
struct xmit_frame *pmgntframe;
|
|
|
struct pkt_attrib *pattrib;
|
|
@@ -3260,7 +3260,7 @@ void issue_action_spct_ch_switch (struct adapter *padapter, u8 *ra, u8 new_ch, u
|
|
|
pframe = rtw_set_fixed_ie(pframe, 1, &(action), &(pattrib->pktlen));
|
|
|
}
|
|
|
|
|
|
- pframe = rtw_set_ie_ch_switch (pframe, &(pattrib->pktlen), 0, new_ch, 0);
|
|
|
+ pframe = rtw_set_ie_ch_switch(pframe, &(pattrib->pktlen), 0, new_ch, 0);
|
|
|
pframe = rtw_set_ie_secondary_ch_offset(pframe, &(pattrib->pktlen),
|
|
|
hal_ch_offset_to_secondary_ch_offset(ch_offset));
|
|
|
|