Commit 525cc4f9 authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman

staging: rtl8723bs: remove blank lines

Remove unrequired blank lines as reported by checkpatch.
Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a35115f3
...@@ -65,7 +65,6 @@ int cckrates_included(unsigned char *rate, int ratelen) ...@@ -65,7 +65,6 @@ int cckrates_included(unsigned char *rate, int ratelen)
} }
return false; return false;
} }
int cckratesonly_included(unsigned char *rate, int ratelen) int cckratesonly_included(unsigned char *rate, int ratelen)
...@@ -134,10 +133,8 @@ u8 networktype_to_raid_ex(struct adapter *adapter, struct sta_info *psta) ...@@ -134,10 +133,8 @@ u8 networktype_to_raid_ex(struct adapter *adapter, struct sta_info *psta)
default: default:
raid = RATEID_IDX_BGN_40M_2SS; raid = RATEID_IDX_BGN_40M_2SS;
break; break;
} }
return raid; return raid;
} }
unsigned char ratetbl_val_2wifirate(unsigned char rate); unsigned char ratetbl_val_2wifirate(unsigned char rate);
...@@ -193,11 +190,9 @@ unsigned char ratetbl_val_2wifirate(unsigned char rate) ...@@ -193,11 +190,9 @@ unsigned char ratetbl_val_2wifirate(unsigned char rate)
case 11: case 11:
val = IEEE80211_OFDM_RATE_54MB; val = IEEE80211_OFDM_RATE_54MB;
break; break;
} }
return val; return val;
} }
int is_basicrate(struct adapter *padapter, unsigned char rate); int is_basicrate(struct adapter *padapter, unsigned char rate);
...@@ -292,7 +287,6 @@ void UpdateBrateTbl(struct adapter *Adapter, u8 *mBratesOS) ...@@ -292,7 +287,6 @@ void UpdateBrateTbl(struct adapter *Adapter, u8 *mBratesOS)
break; break;
} }
} }
} }
void UpdateBrateTblForSoftAP(u8 *bssrateset, u32 bssratelen) void UpdateBrateTblForSoftAP(u8 *bssrateset, u32 bssratelen)
...@@ -311,7 +305,6 @@ void UpdateBrateTblForSoftAP(u8 *bssrateset, u32 bssratelen) ...@@ -311,7 +305,6 @@ void UpdateBrateTblForSoftAP(u8 *bssrateset, u32 bssratelen)
break; break;
} }
} }
} }
void Save_DM_Func_Flag(struct adapter *padapter) void Save_DM_Func_Flag(struct adapter *padapter)
...@@ -499,7 +492,6 @@ u16 get_beacon_interval(struct wlan_bssid_ex *bss) ...@@ -499,7 +492,6 @@ u16 get_beacon_interval(struct wlan_bssid_ex *bss)
memcpy((unsigned char *)&val, rtw_get_beacon_interval_from_ie(bss->IEs), 2); memcpy((unsigned char *)&val, rtw_get_beacon_interval_from_ie(bss->IEs), 2);
return le16_to_cpu(val); return le16_to_cpu(val);
} }
int is_client_associated_to_ap(struct adapter *padapter) int is_client_associated_to_ap(struct adapter *padapter)
...@@ -542,7 +534,6 @@ int is_IBSS_empty(struct adapter *padapter) ...@@ -542,7 +534,6 @@ int is_IBSS_empty(struct adapter *padapter)
} }
return true; return true;
} }
unsigned int decide_wait_for_beacon_timeout(unsigned int bcn_interval) unsigned int decide_wait_for_beacon_timeout(unsigned int bcn_interval)
...@@ -854,7 +845,6 @@ void flush_all_cam_entry(struct adapter *padapter) ...@@ -854,7 +845,6 @@ void flush_all_cam_entry(struct adapter *padapter)
rtw_hal_set_hwreg(padapter, HW_VAR_SEC_DK_CFG, (u8 *)false); rtw_hal_set_hwreg(padapter, HW_VAR_SEC_DK_CFG, (u8 *)false);
memset((u8 *)(pmlmeinfo->FW_sta_info), 0, sizeof(pmlmeinfo->FW_sta_info)); memset((u8 *)(pmlmeinfo->FW_sta_info), 0, sizeof(pmlmeinfo->FW_sta_info));
} }
int WMM_param_handler(struct adapter *padapter, struct ndis_80211_var_ie *pIE) int WMM_param_handler(struct adapter *padapter, struct ndis_80211_var_ie *pIE)
...@@ -1068,7 +1058,6 @@ static void bwmode_update_check(struct adapter *padapter, struct ndis_80211_var_ ...@@ -1068,7 +1058,6 @@ static void bwmode_update_check(struct adapter *padapter, struct ndis_80211_var_
new_ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE; new_ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE;
} }
if ((new_bwmode != pmlmeext->cur_bwmode) || (new_ch_offset != pmlmeext->cur_ch_offset)) { if ((new_bwmode != pmlmeext->cur_bwmode) || (new_ch_offset != pmlmeext->cur_ch_offset)) {
pmlmeinfo->bwmode_updated = true; pmlmeinfo->bwmode_updated = true;
...@@ -1080,7 +1069,6 @@ static void bwmode_update_check(struct adapter *padapter, struct ndis_80211_var_ ...@@ -1080,7 +1069,6 @@ static void bwmode_update_check(struct adapter *padapter, struct ndis_80211_var_
} else } else
pmlmeinfo->bwmode_updated = false; pmlmeinfo->bwmode_updated = false;
if (true == pmlmeinfo->bwmode_updated) { if (true == pmlmeinfo->bwmode_updated) {
struct sta_info *psta; struct sta_info *psta;
struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network); struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network);
...@@ -1088,7 +1076,6 @@ static void bwmode_update_check(struct adapter *padapter, struct ndis_80211_var_ ...@@ -1088,7 +1076,6 @@ static void bwmode_update_check(struct adapter *padapter, struct ndis_80211_var_
/* set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode); */ /* set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode); */
/* update ap's stainfo */ /* update ap's stainfo */
psta = rtw_get_stainfo(pstapriv, cur_network->MacAddress); psta = rtw_get_stainfo(pstapriv, cur_network->MacAddress);
if (psta) { if (psta) {
...@@ -1208,7 +1195,6 @@ void HT_info_handler(struct adapter *padapter, struct ndis_80211_var_ie *pIE) ...@@ -1208,7 +1195,6 @@ void HT_info_handler(struct adapter *padapter, struct ndis_80211_var_ie *pIE)
if (phtpriv->ht_option == false) if (phtpriv->ht_option == false)
return; return;
if (pIE->Length > sizeof(struct HT_info_element)) if (pIE->Length > sizeof(struct HT_info_element))
return; return;
...@@ -1620,7 +1606,6 @@ unsigned int is_ap_in_tkip(struct adapter *padapter) ...@@ -1620,7 +1606,6 @@ unsigned int is_ap_in_tkip(struct adapter *padapter)
return false; return false;
} else } else
return false; return false;
} }
int support_short_GI(struct adapter *padapter, struct HT_caps_element *pHT_caps, u8 bwmode) int support_short_GI(struct adapter *padapter, struct HT_caps_element *pHT_caps, u8 bwmode)
...@@ -1772,7 +1757,6 @@ void update_IOT_info(struct adapter *padapter) ...@@ -1772,7 +1757,6 @@ void update_IOT_info(struct adapter *padapter)
pmlmeinfo->turboMode_rtsen = 1; pmlmeinfo->turboMode_rtsen = 1;
break; break;
} }
} }
void update_capinfo(struct adapter *Adapter, u16 updateCap) void update_capinfo(struct adapter *Adapter, u16 updateCap)
...@@ -1785,7 +1769,6 @@ void update_capinfo(struct adapter *Adapter, u16 updateCap) ...@@ -1785,7 +1769,6 @@ void update_capinfo(struct adapter *Adapter, u16 updateCap)
/* Mark to update preamble value forever, 2008.03.18 by lanhsin */ /* Mark to update preamble value forever, 2008.03.18 by lanhsin */
/* if (pMgntInfo->RegPreambleMode == PREAMBLE_AUTO) */ /* if (pMgntInfo->RegPreambleMode == PREAMBLE_AUTO) */
{ {
if (updateCap & cShortPreamble) { if (updateCap & cShortPreamble) {
/* Short Preamble */ /* Short Preamble */
if (pmlmeinfo->preamble_mode != PREAMBLE_SHORT) { /* PREAMBLE_LONG or PREAMBLE_AUTO */ if (pmlmeinfo->preamble_mode != PREAMBLE_SHORT) { /* PREAMBLE_LONG or PREAMBLE_AUTO */
...@@ -1823,7 +1806,6 @@ void update_capinfo(struct adapter *Adapter, u16 updateCap) ...@@ -1823,7 +1806,6 @@ void update_capinfo(struct adapter *Adapter, u16 updateCap)
} }
rtw_hal_set_hwreg(Adapter, HW_VAR_SLOT_TIME, &pmlmeinfo->slotTime); rtw_hal_set_hwreg(Adapter, HW_VAR_SLOT_TIME, &pmlmeinfo->slotTime);
} }
void update_wireless_mode(struct adapter *padapter) void update_wireless_mode(struct adapter *padapter)
...@@ -1908,7 +1890,6 @@ int update_sta_support_rate(struct adapter *padapter, u8 *pvar_ie, uint var_ie_l ...@@ -1908,7 +1890,6 @@ int update_sta_support_rate(struct adapter *padapter, u8 *pvar_ie, uint var_ie_l
memcpy((pmlmeinfo->FW_sta_info[cam_idx].SupportedRates + supportRateNum), pIE->data, ie_len); memcpy((pmlmeinfo->FW_sta_info[cam_idx].SupportedRates + supportRateNum), pIE->data, ie_len);
return _SUCCESS; return _SUCCESS;
} }
void process_addba_req(struct adapter *padapter, u8 *paddba_req, u8 *addr) void process_addba_req(struct adapter *padapter, u8 *paddba_req, u8 *addr)
...@@ -1943,7 +1924,6 @@ void process_addba_req(struct adapter *padapter, u8 *paddba_req, u8 *addr) ...@@ -1943,7 +1924,6 @@ void process_addba_req(struct adapter *padapter, u8 *paddba_req, u8 *addr)
preorder_ctrl->enable = pmlmeinfo->accept_addba_req; preorder_ctrl->enable = pmlmeinfo->accept_addba_req;
} }
} }
void update_TSF(struct mlme_ext_priv *pmlmeext, u8 *pframe, uint len) void update_TSF(struct mlme_ext_priv *pmlmeext, u8 *pframe, uint len)
...@@ -1975,7 +1955,6 @@ void adaptive_early_32k(struct mlme_ext_priv *pmlmeext, u8 *pframe, uint len) ...@@ -1975,7 +1955,6 @@ void adaptive_early_32k(struct mlme_ext_priv *pmlmeext, u8 *pframe, uint len)
u32 delay_ms; u32 delay_ms;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
pmlmeext->bcn_cnt++; pmlmeext->bcn_cnt++;
pIE = pframe + sizeof(struct ieee80211_hdr_3addr); pIE = pframe + sizeof(struct ieee80211_hdr_3addr);
...@@ -2025,7 +2004,6 @@ void adaptive_early_32k(struct mlme_ext_priv *pmlmeext, u8 *pframe, uint len) ...@@ -2025,7 +2004,6 @@ void adaptive_early_32k(struct mlme_ext_priv *pmlmeext, u8 *pframe, uint len)
for (i = 0; i < 9; i++) { for (i = 0; i < 9; i++) {
pmlmeext->bcn_delay_ratio[i] = (pmlmeext->bcn_delay_cnt[i] * 100) / pmlmeext->bcn_cnt; pmlmeext->bcn_delay_ratio[i] = (pmlmeext->bcn_delay_cnt[i] * 100) / pmlmeext->bcn_cnt;
DBG_871X("%s():bcn_delay_cnt[%d]=%d, bcn_delay_ratio[%d]=%d\n", __func__, i, DBG_871X("%s():bcn_delay_cnt[%d]=%d, bcn_delay_ratio[%d]=%d\n", __func__, i,
pmlmeext->bcn_delay_cnt[i], i, pmlmeext->bcn_delay_ratio[i]); pmlmeext->bcn_delay_cnt[i], i, pmlmeext->bcn_delay_ratio[i]);
...@@ -2052,10 +2030,8 @@ void adaptive_early_32k(struct mlme_ext_priv *pmlmeext, u8 *pframe, uint len) ...@@ -2052,10 +2030,8 @@ void adaptive_early_32k(struct mlme_ext_priv *pmlmeext, u8 *pframe, uint len)
pmlmeext->bcn_cnt = 0; pmlmeext->bcn_cnt = 0;
} }
} }
void beacon_timing_control(struct adapter *padapter) void beacon_timing_control(struct adapter *padapter)
{ {
rtw_hal_bcn_related_reg_setting(padapter); rtw_hal_bcn_related_reg_setting(padapter);
...@@ -2067,7 +2043,6 @@ void rtw_alloc_macid(struct adapter *padapter, struct sta_info *psta) ...@@ -2067,7 +2043,6 @@ void rtw_alloc_macid(struct adapter *padapter, struct sta_info *psta)
u8 bc_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; u8 bc_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
struct dvobj_priv *pdvobj = adapter_to_dvobj(padapter); struct dvobj_priv *pdvobj = adapter_to_dvobj(padapter);
if (!memcmp(psta->hwaddr, bc_addr, ETH_ALEN)) if (!memcmp(psta->hwaddr, bc_addr, ETH_ALEN))
return; return;
...@@ -2092,7 +2067,6 @@ void rtw_alloc_macid(struct adapter *padapter, struct sta_info *psta) ...@@ -2092,7 +2067,6 @@ void rtw_alloc_macid(struct adapter *padapter, struct sta_info *psta)
psta->mac_id = i; psta->mac_id = i;
DBG_871X("%s = %d\n", __func__, psta->mac_id); DBG_871X("%s = %d\n", __func__, psta->mac_id);
} }
} }
void rtw_release_macid(struct adapter *padapter, struct sta_info *psta) void rtw_release_macid(struct adapter *padapter, struct sta_info *psta)
...@@ -2100,7 +2074,6 @@ void rtw_release_macid(struct adapter *padapter, struct sta_info *psta) ...@@ -2100,7 +2074,6 @@ void rtw_release_macid(struct adapter *padapter, struct sta_info *psta)
u8 bc_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; u8 bc_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
struct dvobj_priv *pdvobj = adapter_to_dvobj(padapter); struct dvobj_priv *pdvobj = adapter_to_dvobj(padapter);
if (!memcmp(psta->hwaddr, bc_addr, ETH_ALEN)) if (!memcmp(psta->hwaddr, bc_addr, ETH_ALEN))
return; return;
...@@ -2114,10 +2087,8 @@ void rtw_release_macid(struct adapter *padapter, struct sta_info *psta) ...@@ -2114,10 +2087,8 @@ void rtw_release_macid(struct adapter *padapter, struct sta_info *psta)
pdvobj->macid[psta->mac_id] = false; pdvobj->macid[psta->mac_id] = false;
psta->mac_id = NUM_STA; psta->mac_id = NUM_STA;
} }
} }
spin_unlock_bh(&pdvobj->lock); spin_unlock_bh(&pdvobj->lock);
} }
/* For 8188E RA */ /* For 8188E RA */
u8 rtw_search_max_mac_id(struct adapter *padapter) u8 rtw_search_max_mac_id(struct adapter *padapter)
...@@ -2134,7 +2105,6 @@ u8 rtw_search_max_mac_id(struct adapter *padapter) ...@@ -2134,7 +2105,6 @@ u8 rtw_search_max_mac_id(struct adapter *padapter)
spin_unlock_bh(&pdvobj->lock); spin_unlock_bh(&pdvobj->lock);
return max_mac_id; return max_mac_id;
} }
struct adapter *dvobj_get_port0_adapter(struct dvobj_priv *dvobj) struct adapter *dvobj_get_port0_adapter(struct dvobj_priv *dvobj)
......
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