Commit a920f3be authored by Soumyajit Deb's avatar Soumyajit Deb Committed by Greg Kroah-Hartman

staging: rtl8188eu: Line over 80 characters

Break various lines into multiple lines to respect 80 character width
limit.
Reported by checkpatch.pl
Signed-off-by: default avatarSoumyajit Deb <debsoumyajit100@gmail.com>
Link: https://lore.kernel.org/r/20200406111706.25957-4-debsoumyajit100@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1003537f
...@@ -264,8 +264,10 @@ void expire_timeout_chk(struct adapter *padapter) ...@@ -264,8 +264,10 @@ void expire_timeout_chk(struct adapter *padapter)
list_del_init(&psta->asoc_list); list_del_init(&psta->asoc_list);
pstapriv->asoc_list_cnt--; pstapriv->asoc_list_cnt--;
DBG_88E("asoc expire %pM, state = 0x%x\n", (psta->hwaddr), psta->state); DBG_88E("asoc expire %pM, state = 0x%x\n",
updated = ap_free_sta(padapter, psta, true, WLAN_REASON_DEAUTH_LEAVING); (psta->hwaddr), psta->state);
updated = ap_free_sta(padapter, psta, true,
WLAN_REASON_DEAUTH_LEAVING);
} else { } else {
/* TODO: Aging mechanism to digest frames in sleep_q to avoid running out of xmitframe */ /* TODO: Aging mechanism to digest frames in sleep_q to avoid running out of xmitframe */
if (psta->sleepq_len > (NR_XMITFRAME / pstapriv->asoc_list_cnt) && if (psta->sleepq_len > (NR_XMITFRAME / pstapriv->asoc_list_cnt) &&
...@@ -294,16 +296,21 @@ void expire_timeout_chk(struct adapter *padapter) ...@@ -294,16 +296,21 @@ void expire_timeout_chk(struct adapter *padapter)
for (i = 0; i < chk_alive_num; i++) { for (i = 0; i < chk_alive_num; i++) {
int ret = _FAIL; int ret = _FAIL;
psta = rtw_get_stainfo_by_offset(pstapriv, chk_alive_list[i]); psta = rtw_get_stainfo_by_offset(pstapriv,
chk_alive_list[i]);
if (psta->state & WIFI_SLEEP_STATE) if (psta->state & WIFI_SLEEP_STATE) {
ret = issue_nulldata(padapter, psta->hwaddr, 0, 1, 50); ret = issue_nulldata(padapter, psta->hwaddr,
else 0, 1, 50);
ret = issue_nulldata(padapter, psta->hwaddr, 0, 3, 50); } else {
ret = issue_nulldata(padapter, psta->hwaddr,
0, 3, 50);
}
psta->keep_alive_trycnt++; psta->keep_alive_trycnt++;
if (ret == _SUCCESS) { if (ret == _SUCCESS) {
DBG_88E("asoc check, sta(%pM) is alive\n", (psta->hwaddr)); DBG_88E("asoc check, sta(%pM) is alive\n",
(psta->hwaddr));
psta->expire_to = pstapriv->expire_to; psta->expire_to = pstapriv->expire_to;
psta->keep_alive_trycnt = 0; psta->keep_alive_trycnt = 0;
continue; continue;
...@@ -315,11 +322,13 @@ void expire_timeout_chk(struct adapter *padapter) ...@@ -315,11 +322,13 @@ void expire_timeout_chk(struct adapter *padapter)
psta->keep_alive_trycnt = 0; psta->keep_alive_trycnt = 0;
DBG_88E("asoc expire %pM, state = 0x%x\n", psta->hwaddr, psta->state); DBG_88E("asoc expire %pM, state = 0x%x\n",
psta->hwaddr, psta->state);
spin_lock_bh(&pstapriv->asoc_list_lock); spin_lock_bh(&pstapriv->asoc_list_lock);
list_del_init(&psta->asoc_list); list_del_init(&psta->asoc_list);
pstapriv->asoc_list_cnt--; pstapriv->asoc_list_cnt--;
updated = ap_free_sta(padapter, psta, true, WLAN_REASON_DEAUTH_LEAVING); updated = ap_free_sta(padapter, psta, true,
WLAN_REASON_DEAUTH_LEAVING);
spin_unlock_bh(&pstapriv->asoc_list_lock); spin_unlock_bh(&pstapriv->asoc_list_lock);
} }
...@@ -431,7 +440,8 @@ static void update_bmc_sta(struct adapter *padapter) ...@@ -431,7 +440,8 @@ static void update_bmc_sta(struct adapter *padapter)
supportRateNum = rtw_get_rateset_len((u8 *)&pcur_network->SupportedRates); supportRateNum = rtw_get_rateset_len((u8 *)&pcur_network->SupportedRates);
network_type = rtw_check_network_type((u8 *)&pcur_network->SupportedRates); network_type = rtw_check_network_type((u8 *)&pcur_network->SupportedRates);
memcpy(psta->bssrateset, &pcur_network->SupportedRates, supportRateNum); memcpy(psta->bssrateset, &pcur_network->SupportedRates,
supportRateNum);
psta->bssratelen = supportRateNum; psta->bssratelen = supportRateNum;
/* b/g mode ra_bitmap */ /* b/g mode ra_bitmap */
...@@ -445,7 +455,8 @@ static void update_bmc_sta(struct adapter *padapter) ...@@ -445,7 +455,8 @@ static void update_bmc_sta(struct adapter *padapter)
tx_ra_bitmap = 0xf; tx_ra_bitmap = 0xf;
raid = networktype_to_raid(network_type); raid = networktype_to_raid(network_type);
init_rate = get_highest_rate_idx(tx_ra_bitmap & 0x0fffffff) & 0x3f; init_rate = get_highest_rate_idx(tx_ra_bitmap & 0x0fffffff) &
0x3f;
/* ap mode */ /* ap mode */
rtw_hal_set_odm_var(padapter, HAL_ODM_STA_INFO, psta, true); rtw_hal_set_odm_var(padapter, HAL_ODM_STA_INFO, psta, true);
...@@ -456,7 +467,8 @@ static void update_bmc_sta(struct adapter *padapter) ...@@ -456,7 +467,8 @@ static void update_bmc_sta(struct adapter *padapter)
arg = psta->mac_id & 0x1f; arg = psta->mac_id & 0x1f;
arg |= BIT(7); arg |= BIT(7);
tx_ra_bitmap |= ((raid << 28) & 0xf0000000); tx_ra_bitmap |= ((raid << 28) & 0xf0000000);
DBG_88E("%s, mask = 0x%x, arg = 0x%x\n", __func__, tx_ra_bitmap, arg); DBG_88E("%s, mask = 0x%x, arg = 0x%x\n", __func__,
tx_ra_bitmap, arg);
/* bitmap[0:27] = tx_rate_bitmap */ /* bitmap[0:27] = tx_rate_bitmap */
/* bitmap[28:31]= Rate Adaptive id */ /* bitmap[28:31]= Rate Adaptive id */
...@@ -647,7 +659,8 @@ static void start_bss_network(struct adapter *padapter, u8 *pbuf) ...@@ -647,7 +659,8 @@ static void start_bss_network(struct adapter *padapter, u8 *pbuf)
rtw_hal_set_hwreg(padapter, HW_VAR_SEC_CFG, (u8 *)(&val8)); rtw_hal_set_hwreg(padapter, HW_VAR_SEC_CFG, (u8 *)(&val8));
/* Beacon Control related register */ /* Beacon Control related register */
rtw_hal_set_hwreg(padapter, HW_VAR_BEACON_INTERVAL, (u8 *)(&bcn_interval)); rtw_hal_set_hwreg(padapter, HW_VAR_BEACON_INTERVAL,
(u8 *)(&bcn_interval));
UpdateBrateTbl(padapter, pnetwork->SupportedRates); UpdateBrateTbl(padapter, pnetwork->SupportedRates);
rtw_hal_set_hwreg(padapter, HW_VAR_BASIC_RATE, pnetwork->SupportedRates); rtw_hal_set_hwreg(padapter, HW_VAR_BASIC_RATE, pnetwork->SupportedRates);
...@@ -657,7 +670,10 @@ static void start_bss_network(struct adapter *padapter, u8 *pbuf) ...@@ -657,7 +670,10 @@ static void start_bss_network(struct adapter *padapter, u8 *pbuf)
Switch_DM_Func(padapter, DYNAMIC_ALL_FUNC_ENABLE, true); Switch_DM_Func(padapter, DYNAMIC_ALL_FUNC_ENABLE, true);
} }
/* set channel, bwmode */ /* set channel, bwmode */
p = rtw_get_ie(pnetwork->ies + sizeof(struct ndis_802_11_fixed_ie), _HT_ADD_INFO_IE_, &ie_len, pnetwork->ie_length - sizeof(struct ndis_802_11_fixed_ie)); p = rtw_get_ie(pnetwork->ies + sizeof(struct ndis_802_11_fixed_ie),
_HT_ADD_INFO_IE_, &ie_len,
pnetwork->ie_length -
sizeof(struct ndis_802_11_fixed_ie));
if (p && ie_len) { if (p && ie_len) {
pht_info = (struct HT_info_element *)(p + 2); pht_info = (struct HT_info_element *)(p + 2);
...@@ -682,7 +698,8 @@ static void start_bss_network(struct adapter *padapter, u8 *pbuf) ...@@ -682,7 +698,8 @@ static void start_bss_network(struct adapter *padapter, u8 *pbuf)
*/ */
set_channel_bwmode(padapter, cur_channel, cur_ch_offset, cur_bwmode); set_channel_bwmode(padapter, cur_channel, cur_ch_offset, cur_bwmode);
DBG_88E("CH =%d, BW =%d, offset =%d\n", cur_channel, cur_bwmode, cur_ch_offset); DBG_88E("CH =%d, BW =%d, offset =%d\n", cur_channel, cur_bwmode,
cur_ch_offset);
/* */ /* */
pmlmeext->cur_channel = cur_channel; pmlmeext->cur_channel = cur_channel;
...@@ -771,7 +788,8 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) ...@@ -771,7 +788,8 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)
cap = get_unaligned_le16(ie); cap = get_unaligned_le16(ie);
/* SSID */ /* SSID */
p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _SSID_IE_, &ie_len, pbss_network->ie_length - _BEACON_IE_OFFSET_); p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _SSID_IE_, &ie_len,
pbss_network->ie_length - _BEACON_IE_OFFSET_);
if (p && ie_len > 0) { if (p && ie_len > 0) {
memset(&pbss_network->ssid, 0, sizeof(struct ndis_802_11_ssid)); memset(&pbss_network->ssid, 0, sizeof(struct ndis_802_11_ssid));
memcpy(pbss_network->ssid.ssid, p + 2, ie_len); memcpy(pbss_network->ssid.ssid, p + 2, ie_len);
...@@ -781,7 +799,8 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) ...@@ -781,7 +799,8 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)
/* channel */ /* channel */
channel = 0; channel = 0;
pbss_network->Configuration.Length = 0; pbss_network->Configuration.Length = 0;
p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _DSSET_IE_, &ie_len, (pbss_network->ie_length - _BEACON_IE_OFFSET_)); p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _DSSET_IE_, &ie_len,
(pbss_network->ie_length - _BEACON_IE_OFFSET_));
if (p && ie_len > 0) if (p && ie_len > 0)
channel = *(p + 2); channel = *(p + 2);
...@@ -789,14 +808,16 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) ...@@ -789,14 +808,16 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)
memset(supportRate, 0, NDIS_802_11_LENGTH_RATES_EX); memset(supportRate, 0, NDIS_802_11_LENGTH_RATES_EX);
/* get supported rates */ /* get supported rates */
p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _SUPPORTEDRATES_IE_, &ie_len, pbss_network->ie_length - _BEACON_IE_OFFSET_); p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _SUPPORTEDRATES_IE_, &ie_len,
pbss_network->ie_length - _BEACON_IE_OFFSET_);
if (p) { if (p) {
memcpy(supportRate, p + 2, ie_len); memcpy(supportRate, p + 2, ie_len);
supportRateNum = ie_len; supportRateNum = ie_len;
} }
/* get ext_supported rates */ /* get ext_supported rates */
p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _EXT_SUPPORTEDRATES_IE_, &ie_len, pbss_network->ie_length - _BEACON_IE_OFFSET_); p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _EXT_SUPPORTEDRATES_IE_,
&ie_len, pbss_network->ie_length - _BEACON_IE_OFFSET_);
if (p) { if (p) {
memcpy(supportRate + supportRateNum, p + 2, ie_len); memcpy(supportRate + supportRateNum, p + 2, ie_len);
supportRateNum += ie_len; supportRateNum += ie_len;
...@@ -807,7 +828,8 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) ...@@ -807,7 +828,8 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)
rtw_set_supported_rate(pbss_network->SupportedRates, network_type); rtw_set_supported_rate(pbss_network->SupportedRates, network_type);
/* parsing ERP_IE */ /* parsing ERP_IE */
p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _ERPINFO_IE_, &ie_len, pbss_network->ie_length - _BEACON_IE_OFFSET_); p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _ERPINFO_IE_, &ie_len,
pbss_network->ie_length - _BEACON_IE_OFFSET_);
if (p && ie_len > 0) if (p && ie_len > 0)
ERP_IE_handler(padapter, (struct ndis_802_11_var_ie *)p); ERP_IE_handler(padapter, (struct ndis_802_11_var_ie *)p);
...@@ -824,7 +846,8 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) ...@@ -824,7 +846,8 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)
pairwise_cipher = 0; pairwise_cipher = 0;
psecuritypriv->wpa2_group_cipher = _NO_PRIVACY_; psecuritypriv->wpa2_group_cipher = _NO_PRIVACY_;
psecuritypriv->wpa2_pairwise_cipher = _NO_PRIVACY_; psecuritypriv->wpa2_pairwise_cipher = _NO_PRIVACY_;
p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _RSN_IE_2_, &ie_len, pbss_network->ie_length - _BEACON_IE_OFFSET_); p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _RSN_IE_2_, &ie_len,
pbss_network->ie_length - _BEACON_IE_OFFSET_);
if (p && ie_len > 0) { if (p && ie_len > 0) {
if (rtw_parse_wpa2_ie(p, ie_len + 2, &group_cipher, &pairwise_cipher, NULL) == _SUCCESS) { if (rtw_parse_wpa2_ie(p, ie_len + 2, &group_cipher, &pairwise_cipher, NULL) == _SUCCESS) {
psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_8021X; psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_8021X;
......
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