Commit 945cd472 authored by Scott Matheina's avatar Scott Matheina Committed by Greg Kroah-Hartman

staging:rtl8188eu:core Fixes Alignment should match opening brace

Fixed style issue: Alignment should match open brace
Signed-off-by: default avatarScott Matheina <scott@matheina.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 015ae428
...@@ -94,10 +94,9 @@ static void update_BCNTIM(struct adapter *padapter) ...@@ -94,10 +94,9 @@ static void update_BCNTIM(struct adapter *padapter)
offset += pnetwork_mlmeext->Ssid.SsidLength + 2; offset += pnetwork_mlmeext->Ssid.SsidLength + 2;
/* get supported rates len */ /* get supported rates len */
p = rtw_get_ie(pie + _BEACON_IE_OFFSET_, p = rtw_get_ie(pie + _BEACON_IE_OFFSET_, _SUPPORTEDRATES_IE_,
_SUPPORTEDRATES_IE_, &tmp_len, &tmp_len, (pnetwork_mlmeext->IELength -
(pnetwork_mlmeext->IELength - _BEACON_IE_OFFSET_));
_BEACON_IE_OFFSET_));
if (p) if (p)
offset += tmp_len+2; offset += tmp_len+2;
...@@ -116,13 +115,12 @@ static void update_BCNTIM(struct adapter *padapter) ...@@ -116,13 +115,12 @@ static void update_BCNTIM(struct adapter *padapter)
if (remainder_ielen > 0) { if (remainder_ielen > 0) {
pbackup_remainder_ie = rtw_malloc(remainder_ielen); pbackup_remainder_ie = rtw_malloc(remainder_ielen);
if (pbackup_remainder_ie && premainder_ie) if (pbackup_remainder_ie && premainder_ie)
memcpy(pbackup_remainder_ie, memcpy(pbackup_remainder_ie, premainder_ie,
premainder_ie, remainder_ielen); remainder_ielen);
} }
*dst_ie++ = _TIM_IE_; *dst_ie++ = _TIM_IE_;
if ((pstapriv->tim_bitmap&0xff00) && if ((pstapriv->tim_bitmap&0xff00) && (pstapriv->tim_bitmap&0x00fc))
(pstapriv->tim_bitmap&0x00fc))
tim_ielen = 5; tim_ielen = 5;
else else
tim_ielen = 4; tim_ielen = 4;
...@@ -157,7 +155,7 @@ static void update_BCNTIM(struct adapter *padapter) ...@@ -157,7 +155,7 @@ static void update_BCNTIM(struct adapter *padapter)
} }
void rtw_add_bcn_ie(struct adapter *padapter, struct wlan_bssid_ex *pnetwork, void rtw_add_bcn_ie(struct adapter *padapter, struct wlan_bssid_ex *pnetwork,
u8 index, u8 *data, u8 len) u8 index, u8 *data, u8 len)
{ {
struct ndis_802_11_var_ie *pIE; struct ndis_802_11_var_ie *pIE;
u8 bmatch = false; u8 bmatch = false;
...@@ -201,8 +199,8 @@ void rtw_add_bcn_ie(struct adapter *padapter, struct wlan_bssid_ex *pnetwork, ...@@ -201,8 +199,8 @@ void rtw_add_bcn_ie(struct adapter *padapter, struct wlan_bssid_ex *pnetwork,
if (remainder_ielen > 0) { if (remainder_ielen > 0) {
pbackup_remainder_ie = rtw_malloc(remainder_ielen); pbackup_remainder_ie = rtw_malloc(remainder_ielen);
if (pbackup_remainder_ie && premainder_ie) if (pbackup_remainder_ie && premainder_ie)
memcpy(pbackup_remainder_ie, memcpy(pbackup_remainder_ie, premainder_ie,
premainder_ie, remainder_ielen); remainder_ielen);
} }
*dst_ie++ = index; *dst_ie++ = index;
...@@ -223,7 +221,7 @@ void rtw_add_bcn_ie(struct adapter *padapter, struct wlan_bssid_ex *pnetwork, ...@@ -223,7 +221,7 @@ void rtw_add_bcn_ie(struct adapter *padapter, struct wlan_bssid_ex *pnetwork,
} }
void rtw_remove_bcn_ie(struct adapter *padapter, struct wlan_bssid_ex *pnetwork, void rtw_remove_bcn_ie(struct adapter *padapter, struct wlan_bssid_ex *pnetwork,
u8 index) u8 index)
{ {
u8 *p, *dst_ie = NULL, *premainder_ie = NULL; u8 *p, *dst_ie = NULL, *premainder_ie = NULL;
u8 *pbackup_remainder_ie = NULL; u8 *pbackup_remainder_ie = NULL;
...@@ -247,8 +245,8 @@ void rtw_remove_bcn_ie(struct adapter *padapter, struct wlan_bssid_ex *pnetwork, ...@@ -247,8 +245,8 @@ void rtw_remove_bcn_ie(struct adapter *padapter, struct wlan_bssid_ex *pnetwork,
if (remainder_ielen > 0) { if (remainder_ielen > 0) {
pbackup_remainder_ie = rtw_malloc(remainder_ielen); pbackup_remainder_ie = rtw_malloc(remainder_ielen);
if (pbackup_remainder_ie && premainder_ie) if (pbackup_remainder_ie && premainder_ie)
memcpy(pbackup_remainder_ie, memcpy(pbackup_remainder_ie, premainder_ie,
premainder_ie, remainder_ielen); remainder_ielen);
} }
/* copy remainder IE */ /* copy remainder IE */
...@@ -361,8 +359,8 @@ void expire_timeout_chk(struct adapter *padapter) ...@@ -361,8 +359,8 @@ void expire_timeout_chk(struct adapter *padapter)
* for this station * for this station
*/ */
pstapriv->tim_bitmap |= BIT(psta->aid); pstapriv->tim_bitmap |= BIT(psta->aid);
update_beacon(padapter, _TIM_IE_, update_beacon(padapter, _TIM_IE_, NULL,
NULL, false); false);
if (!pmlmeext->active_keep_alive_check) if (!pmlmeext->active_keep_alive_check)
continue; continue;
...@@ -1573,8 +1571,8 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) ...@@ -1573,8 +1571,8 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta)
pmlmepriv->num_sta_ht_no_gf++; pmlmepriv->num_sta_ht_no_gf++;
} }
DBG_88E("%s STA %pM - no greenfield, num of non-gf stations %d\n", DBG_88E("%s STA %pM - no greenfield, num of non-gf stations %d\n",
__func__, (psta->hwaddr), __func__, (psta->hwaddr),
pmlmepriv->num_sta_ht_no_gf); pmlmepriv->num_sta_ht_no_gf);
} }
if ((ht_capab & IEEE80211_HT_CAP_SUP_WIDTH) == 0) { if ((ht_capab & IEEE80211_HT_CAP_SUP_WIDTH) == 0) {
...@@ -1583,8 +1581,8 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) ...@@ -1583,8 +1581,8 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta)
pmlmepriv->num_sta_ht_20mhz++; pmlmepriv->num_sta_ht_20mhz++;
} }
DBG_88E("%s STA %pM - 20 MHz HT, num of 20MHz HT STAs %d\n", DBG_88E("%s STA %pM - 20 MHz HT, num of 20MHz HT STAs %d\n",
__func__, (psta->hwaddr), __func__, (psta->hwaddr),
pmlmepriv->num_sta_ht_20mhz); pmlmepriv->num_sta_ht_20mhz);
} }
} else { } else {
if (!psta->no_ht_set) { if (!psta->no_ht_set) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment