Commit c926f022 authored by Simran Singhal's avatar Simran Singhal Committed by Greg Kroah-Hartman

staging: rtl8723bs: Add line after variable declarations

Add whiteline after variable declarations to remove the checkpatch.pl
warning:
WARNING: Missing a blank line after declarations
Signed-off-by: default avatarSimran Singhal <singhalsimran0@gmail.com>
Link: https://lore.kernel.org/r/20200325164451.GA17569@simran-Inspiron-5558Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6d7e48d0
...@@ -219,6 +219,7 @@ static RT_CHANNEL_PLAN_MAP RTW_CHANNEL_PLAN_MAP_REALTEK_DEFINE = {0x03, 0x02}; ...@@ -219,6 +219,7 @@ static RT_CHANNEL_PLAN_MAP RTW_CHANNEL_PLAN_MAP_REALTEK_DEFINE = {0x03, 0x02};
int rtw_ch_set_search_ch(RT_CHANNEL_INFO *ch_set, const u32 ch) int rtw_ch_set_search_ch(RT_CHANNEL_INFO *ch_set, const u32 ch)
{ {
int i; int i;
for (i = 0; ch_set[i].ChannelNum != 0; i++) { for (i = 0; ch_set[i].ChannelNum != 0; i++) {
if (ch == ch_set[i].ChannelNum) if (ch == ch_set[i].ChannelNum)
break; break;
...@@ -2184,6 +2185,7 @@ unsigned int OnAction_sa_query(struct adapter *padapter, union recv_frame *precv ...@@ -2184,6 +2185,7 @@ unsigned int OnAction_sa_query(struct adapter *padapter, union recv_frame *precv
} }
if (0) { if (0) {
int pp; int pp;
printk("pattrib->pktlen = %d =>", pattrib->pkt_len); printk("pattrib->pktlen = %d =>", pattrib->pkt_len);
for (pp = 0; pp < pattrib->pkt_len; pp++) for (pp = 0; pp < pattrib->pkt_len; pp++)
printk(" %02x ", pframe[pp]); printk(" %02x ", pframe[pp]);
...@@ -2486,6 +2488,7 @@ void issue_beacon(struct adapter *padapter, int timeout_ms) ...@@ -2486,6 +2488,7 @@ void issue_beacon(struct adapter *padapter, int timeout_ms)
/* DBG_871X("ie len =%d\n", cur_network->IELength); */ /* DBG_871X("ie len =%d\n", cur_network->IELength); */
{ {
int len_diff; int len_diff;
memcpy(pframe, cur_network->IEs, cur_network->IELength); memcpy(pframe, cur_network->IEs, cur_network->IELength);
len_diff = update_hidden_ssid( len_diff = update_hidden_ssid(
pframe+_BEACON_IE_OFFSET_ pframe+_BEACON_IE_OFFSET_
...@@ -2500,6 +2503,7 @@ void issue_beacon(struct adapter *padapter, int timeout_ms) ...@@ -2500,6 +2503,7 @@ void issue_beacon(struct adapter *padapter, int timeout_ms)
u8 *wps_ie; u8 *wps_ie;
uint wps_ielen; uint wps_ielen;
u8 sr = 0; u8 sr = 0;
wps_ie = rtw_get_wps_ie(pmgntframe->buf_addr+TXDESC_OFFSET+sizeof(struct ieee80211_hdr_3addr)+_BEACON_IE_OFFSET_, wps_ie = rtw_get_wps_ie(pmgntframe->buf_addr+TXDESC_OFFSET+sizeof(struct ieee80211_hdr_3addr)+_BEACON_IE_OFFSET_,
pattrib->pktlen-sizeof(struct ieee80211_hdr_3addr)-_BEACON_IE_OFFSET_, NULL, &wps_ielen); pattrib->pktlen-sizeof(struct ieee80211_hdr_3addr)-_BEACON_IE_OFFSET_, NULL, &wps_ielen);
if (wps_ie && wps_ielen > 0) { if (wps_ie && wps_ielen > 0) {
...@@ -2700,6 +2704,7 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p ...@@ -2700,6 +2704,7 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p
if (ssid_ie && cur_network->Ssid.SsidLength) { if (ssid_ie && cur_network->Ssid.SsidLength) {
uint remainder_ielen; uint remainder_ielen;
u8 *remainder_ie; u8 *remainder_ie;
remainder_ie = ssid_ie+2; remainder_ie = ssid_ie+2;
remainder_ielen = (pframe-remainder_ie); remainder_ielen = (pframe-remainder_ie);
...@@ -4280,6 +4285,7 @@ void site_survey(struct adapter *padapter) ...@@ -4280,6 +4285,7 @@ void site_survey(struct adapter *padapter)
{ {
struct rtw_ieee80211_channel *ch; struct rtw_ieee80211_channel *ch;
if (pmlmeext->sitesurvey_res.channel_idx < pmlmeext->sitesurvey_res.ch_num) { if (pmlmeext->sitesurvey_res.channel_idx < pmlmeext->sitesurvey_res.ch_num) {
ch = &pmlmeext->sitesurvey_res.ch[pmlmeext->sitesurvey_res.channel_idx]; ch = &pmlmeext->sitesurvey_res.ch[pmlmeext->sitesurvey_res.channel_idx];
survey_channel = ch->hw_value; survey_channel = ch->hw_value;
...@@ -4323,6 +4329,7 @@ void site_survey(struct adapter *padapter) ...@@ -4323,6 +4329,7 @@ void site_survey(struct adapter *padapter)
if (ScanType == SCAN_ACTIVE) { /* obey the channel plan setting... */ if (ScanType == SCAN_ACTIVE) { /* obey the channel plan setting... */
{ {
int i; int i;
for (i = 0; i < RTW_SSID_SCAN_AMOUNT; i++) { for (i = 0; i < RTW_SSID_SCAN_AMOUNT; i++) {
if (pmlmeext->sitesurvey_res.ssid[i].SsidLength) { if (pmlmeext->sitesurvey_res.ssid[i].SsidLength) {
/* IOT issue, When wifi_spec is not set, send one probe req without WPS IE. */ /* IOT issue, When wifi_spec is not set, send one probe req without WPS IE. */
...@@ -4351,6 +4358,7 @@ void site_survey(struct adapter *padapter) ...@@ -4351,6 +4358,7 @@ void site_survey(struct adapter *padapter)
#if defined(CONFIG_SIGNAL_DISPLAY_DBM) && defined(CONFIG_BACKGROUND_NOISE_MONITOR) #if defined(CONFIG_SIGNAL_DISPLAY_DBM) && defined(CONFIG_BACKGROUND_NOISE_MONITOR)
{ {
struct noise_info info; struct noise_info info;
info.bPauseDIG = false; info.bPauseDIG = false;
info.IGIValue = 0; info.IGIValue = 0;
info.max_time = channel_scan_time_ms/2;/* ms */ info.max_time = channel_scan_time_ms/2;/* ms */
...@@ -4518,6 +4526,7 @@ u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, str ...@@ -4518,6 +4526,7 @@ u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, str
p = rtw_get_ie(bssid->IEs + ie_offset, _HT_ADD_INFO_IE_, &len, bssid->IELength - ie_offset); p = rtw_get_ie(bssid->IEs + ie_offset, _HT_ADD_INFO_IE_, &len, bssid->IELength - ie_offset);
if (p) { if (p) {
struct HT_info_element *HT_info = (struct HT_info_element *)(p + 2); struct HT_info_element *HT_info = (struct HT_info_element *)(p + 2);
bssid->Configuration.DSConfig = HT_info->primary_channel; bssid->Configuration.DSConfig = HT_info->primary_channel;
} else { /* use current channel */ } else { /* use current channel */
bssid->Configuration.DSConfig = rtw_get_oper_ch(padapter); bssid->Configuration.DSConfig = rtw_get_oper_ch(padapter);
...@@ -4551,6 +4560,7 @@ u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, str ...@@ -4551,6 +4560,7 @@ u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, str
p = rtw_get_ie(bssid->IEs + ie_offset, _HT_CAPABILITY_IE_, &len, bssid->IELength - ie_offset); p = rtw_get_ie(bssid->IEs + ie_offset, _HT_CAPABILITY_IE_, &len, bssid->IELength - ie_offset);
if (p && len > 0) { if (p && len > 0) {
struct HT_caps_element *pHT_caps; struct HT_caps_element *pHT_caps;
pHT_caps = (struct HT_caps_element *)(p + 2); pHT_caps = (struct HT_caps_element *)(p + 2);
if (le16_to_cpu(pHT_caps->u.HT_cap_element.HT_caps_info) & BIT(14)) if (le16_to_cpu(pHT_caps->u.HT_cap_element.HT_caps_info) & BIT(14))
...@@ -4584,6 +4594,7 @@ void start_create_ibss(struct adapter *padapter) ...@@ -4584,6 +4594,7 @@ void start_create_ibss(struct adapter *padapter)
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)(&(pmlmeinfo->network)); struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)(&(pmlmeinfo->network));
pmlmeext->cur_channel = (u8)pnetwork->Configuration.DSConfig; pmlmeext->cur_channel = (u8)pnetwork->Configuration.DSConfig;
pmlmeinfo->bcn_interval = get_beacon_interval(pnetwork); pmlmeinfo->bcn_interval = get_beacon_interval(pnetwork);
...@@ -5388,6 +5399,7 @@ static void rtw_mlmeext_disconnect(struct adapter *padapter) ...@@ -5388,6 +5399,7 @@ static void rtw_mlmeext_disconnect(struct adapter *padapter)
/* wakeup macid after disconnect. */ /* wakeup macid after disconnect. */
{ {
struct sta_info *psta; struct sta_info *psta;
psta = rtw_get_stainfo(&padapter->stapriv, get_my_bssid(pnetwork)); psta = rtw_get_stainfo(&padapter->stapriv, get_my_bssid(pnetwork));
if (psta) if (psta)
rtw_hal_macid_wakeup(padapter, psta->mac_id); rtw_hal_macid_wakeup(padapter, psta->mac_id);
...@@ -5425,6 +5437,7 @@ void mlmeext_joinbss_event_callback(struct adapter *padapter, int join_res) ...@@ -5425,6 +5437,7 @@ void mlmeext_joinbss_event_callback(struct adapter *padapter, int join_res)
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
u8 join_type; u8 join_type;
struct sta_info *psta; struct sta_info *psta;
if (join_res < 0) { if (join_res < 0) {
join_type = 1; join_type = 1;
rtw_hal_set_hwreg(padapter, HW_VAR_MLME_JOIN, (u8 *)(&join_type)); rtw_hal_set_hwreg(padapter, HW_VAR_MLME_JOIN, (u8 *)(&join_type));
...@@ -6047,6 +6060,7 @@ u8 createbss_hdl(struct adapter *padapter, u8 *pbuf) ...@@ -6047,6 +6060,7 @@ u8 createbss_hdl(struct adapter *padapter, u8 *pbuf)
if (pmlmeinfo->state == WIFI_FW_AP_STATE) { if (pmlmeinfo->state == WIFI_FW_AP_STATE) {
struct wlan_bssid_ex *network = &padapter->mlmepriv.cur_network.network; struct wlan_bssid_ex *network = &padapter->mlmepriv.cur_network.network;
start_bss_network(padapter, (u8 *)network); start_bss_network(padapter, (u8 *)network);
return H2C_SUCCESS; return H2C_SUCCESS;
} }
...@@ -6810,6 +6824,7 @@ u8 set_chplan_hdl(struct adapter *padapter, unsigned char *pbuf) ...@@ -6810,6 +6824,7 @@ u8 set_chplan_hdl(struct adapter *padapter, unsigned char *pbuf)
if ((padapter->rtw_wdev != NULL) && (padapter->rtw_wdev->wiphy)) { if ((padapter->rtw_wdev != NULL) && (padapter->rtw_wdev->wiphy)) {
struct regulatory_request request; struct regulatory_request request;
request.initiator = NL80211_REGDOM_SET_BY_DRIVER; request.initiator = NL80211_REGDOM_SET_BY_DRIVER;
rtw_reg_notifier(padapter->rtw_wdev->wiphy, &request); rtw_reg_notifier(padapter->rtw_wdev->wiphy, &request);
} }
......
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