staging: rtl8188eu: simplify calculation
PATCH 1/8 staging: rtl8188eu: simplify calculation
Simpliy calcualation: * 10 / 2 can be reduced to * 5 Also cleans missing spaces checkpatch issues.
--- drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8188eu/core/rtw_ioctl_set.c +1 -1
@@ -575,7 +575,7 @@ u16 rtw_get_cur_max_rate(struct adapter *adapter) i++; } - max_rate = max_rate*10 /2 ; + max_rate *=5 ; }return max_rate;
Signature · 1 line
2.19.0
PATCH 2/8 staging: rtl8188eu: remove unnecessary parentheses
Remove unnecessary parentheses as reported by checkpatch and from conditionals.
--- .../staging/rtl8188eu/core/rtw_ioctl_set.c | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ioctl_set.c +25 -25
@@ -17,11 +17,11 @@ u8 rtw_do_join(struct adapter *padapter) {struct list_head *plist, *phead;u8 *pibss =NULL ; -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -struct __queue *queue = &(pmlmepriv->scanned_queue); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +struct __queue *queue = &pmlmepriv->scanned_queue;u8 ret = _SUCCESS; -spin_lock_bh (&(pmlmepriv->scanned_queue.lock)); +spin_lock_bh (&pmlmepriv->scanned_queue.lock); phead =get_list_head (queue); plist = phead->next;
@@ -36,7 +36,7 @@ u8 rtw_do_join(struct adapter *padapter) pmlmepriv->to_join = true;if (list_empty (&queue->queue)) { -spin_unlock_bh (&(pmlmepriv->scanned_queue.lock)); +spin_unlock_bh (&pmlmepriv->scanned_queue.lock);_clr_fwstate_ (pmlmepriv, _FW_UNDER_LINKING);/* when set_ssid/set_bssid for rtw_do_join(), but scanning queue is empty */
@@ -60,7 +60,7 @@ u8 rtw_do_join(struct adapter *padapter) }else {int select_ret; -spin_unlock_bh (&(pmlmepriv->scanned_queue.lock)); +spin_unlock_bh (&pmlmepriv->scanned_queue.lock); select_ret =rtw_select_and_join_from_scanned_queue (pmlmepriv);if (select_ret == _SUCCESS) { pmlmepriv->to_join = false;
@@ -71,7 +71,7 @@ u8 rtw_do_join(struct adapter *padapter)/* submit createbss_cmd to change to a ADHOC_MASTER */ /* pmlmepriv->lock has been acquired by caller... */ -struct wlan_bssid_ex *pdev_network = &(padapter->registrypriv.dev_network); +struct wlan_bssid_ex *pdev_network = &padapter->registrypriv.dev_network; pmlmepriv->fw_state =WIFI_ADHOC_MASTER_STATE ;
@@ -172,7 +172,7 @@ u8 rtw_set_802_11_bssid(struct adapter *padapter, u8 *bssid)if (padapter->securitypriv.btkip_countermeasure) { cur_time = jiffies; -if ((cur_time - padapter->securitypriv.btkip_countermeasure_time) >60 *HZ ) { +if (cur_time - padapter->securitypriv.btkip_countermeasure_time >60 *HZ ) { padapter->securitypriv.btkip_countermeasure = false; padapter->securitypriv.btkip_countermeasure_time =0 ; }else {
@@ -229,8 +229,8 @@ u8 rtw_set_802_11_ssid(struct adapter *padapter, struct ndis_802_11_ssid *ssid)RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_info_, ("set_ssid: _FW_LINKED||WIFI_ADHOC_MASTER_STATE\n" )); -if ((pmlmepriv->assoc_ssid.SsidLength == ssid->SsidLength) && - (!memcmp (&pmlmepriv->assoc_ssid.Ssid, ssid->Ssid, ssid->SsidLength))) { +if (pmlmepriv->assoc_ssid.SsidLength == ssid->SsidLength && + !memcmp (&pmlmepriv->assoc_ssid.Ssid, ssid->Ssid, ssid->SsidLength)) {if ((check_fwstate (pmlmepriv,WIFI_STATION_STATE ) == false)) { RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("Set SSID is the same ssid, fw_state = 0x%08x\n",
@@ -279,7 +279,7 @@ u8 rtw_set_802_11_ssid(struct adapter *padapter, struct ndis_802_11_ssid *ssid)if (padapter->securitypriv.btkip_countermeasure) { cur_time = jiffies; -if ((cur_time - padapter->securitypriv.btkip_countermeasure_time) >60 *HZ ) { +if (cur_time - padapter->securitypriv.btkip_countermeasure_time >60 *HZ ) { padapter->securitypriv.btkip_countermeasure = false; padapter->securitypriv.btkip_countermeasure_time =0 ; }else {
@@ -310,7 +310,7 @@ u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter, {struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct wlan_network *cur_network = &pmlmepriv->cur_network; -enum ndis_802_11_network_infra *pold_state = &(cur_network->network.InfrastructureMode); +enum ndis_802_11_network_infra *pold_state = &cur_network->network.InfrastructureMode; RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_notice_, ("+rtw_set_802_11_infrastructure_mode: old =%d new =%d fw_state = 0x%08x\n",
@@ -331,15 +331,15 @@ u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter,#endif } -if ((check_fwstate (pmlmepriv, _FW_LINKED)) || - (*pold_state == Ndis802_11IBSS)) +if (check_fwstate (pmlmepriv, _FW_LINKED) || + *pold_state == Ndis802_11IBSS)rtw_disassoc_cmd (padapter,0 , true); -if ((check_fwstate (pmlmepriv, _FW_LINKED)) || - (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ))) +if (check_fwstate (pmlmepriv, _FW_LINKED) || +check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ))rtw_free_assoc_resources (padapter); -if ((*pold_state == Ndis802_11Infrastructure) || (*pold_state == Ndis802_11IBSS)) { +if (*pold_state == Ndis802_11Infrastructure || *pold_state == Ndis802_11IBSS) {if (check_fwstate (pmlmepriv, _FW_LINKED) == true)rtw_indicate_disconnect (padapter);/* will clr Linked_state; before this function, we must have checked whether issue dis-assoc_cmd or not */ }
@@ -409,8 +409,8 @@ u8 rtw_set_802_11_bssid_list_scan(struct adapter *padapter, struct ndis_802_11_s goto exit; } -if ((check_fwstate (pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING)) || - (pmlmepriv->LinkDetectInfo.bBusyTraffic)) { +if (check_fwstate (pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) || + pmlmepriv->LinkDetectInfo.bBusyTraffic) {/* Scan or linking is in progress, do nothing. */ RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("%s fail since fw_state = %x\n" , __func__,get_fwstate (pmlmepriv))); res = true;
@@ -468,7 +468,7 @@ u8 rtw_set_802_11_authentication_mode(struct adapter *padapter, enum ndis_802_11u8 rtw_set_802_11_add_wep (struct adapter *padapter,struct ndis_802_11_wep *wep) {int keyid, res; -struct security_priv *psecuritypriv = &(padapter->securitypriv); +struct security_priv *psecuritypriv = &padapter->securitypriv;u8 ret = _SUCCESS; keyid = wep->KeyIndex &0x3fffffff ;
@@ -497,7 +497,7 @@ u8 rtw_set_802_11_add_wep(struct adapter *padapter, struct ndis_802_11_wep *wep) ("rtw_set_802_11_add_wep:before memcpy, wep->KeyLength = 0x%x wep->KeyIndex = 0x%x keyid =%x\n" , wep->KeyLength, wep->KeyIndex, keyid)); -memcpy (&(psecuritypriv->dot11DefKey[keyid].skey[0 ]), &(wep->KeyMaterial), wep->KeyLength); +memcpy (&psecuritypriv->dot11DefKey[keyid].skey[0 ], &wep->KeyMaterial, wep->KeyLength); psecuritypriv->dot11DefKeylen[keyid] = wep->KeyLength;
@@ -539,15 +539,15 @@ u16 rtw_get_cur_max_rate(struct adapter *adapter)u8 *p;u16 rate =0 , max_rate =0 ;struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;struct registry_priv *pregistrypriv = &adapter->registrypriv;struct mlme_priv *pmlmepriv = &adapter->mlmepriv;struct wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network;u8 bw_40MHz =0 , short_GI_20 =0 , short_GI_40 =0 ;u32 ht_ielen =0 ; -if ((!check_fwstate (pmlmepriv, _FW_LINKED)) && - (!check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ))) +if (!check_fwstate (pmlmepriv, _FW_LINKED) && + !check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ))return 0 ;if (pmlmeext->cur_wireless_mode & (WIRELESS_11_24N |WIRELESS_11_5N )) {
@@ -561,14 +561,14 @@ u16 rtw_get_cur_max_rate(struct adapter *adapter) max_rate =rtw_mcs_rate (RF_1T1R , - bw_40MHz & (pregistrypriv->cbw40_enable), + bw_40MHz & pregistrypriv->cbw40_enable, short_GI_20, short_GI_40, pmlmeinfo->HT_caps.mcs.rx_mask ); } }else { -while ((pcur_bss->SupportedRates[i] !=0 ) && (pcur_bss->SupportedRates[i] !=0xFF )) { +while (pcur_bss->SupportedRates[i] !=0 && pcur_bss->SupportedRates[i] !=0xFF ) { rate = pcur_bss->SupportedRates[i]&0x7F ;if (rate > max_rate) max_rate = rate;
Signature · 1 line
2.19.0
PATCH 3/8 staging: rtl8188eu: remove whitespace
In reply to Michael StraubeReplace tabs with spaces or just remove spaces in declarations.
--- .../staging/rtl8188eu/core/rtw_ioctl_set.c | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ioctl_set.c +17 -17
@@ -17,8 +17,8 @@ u8 rtw_do_join(struct adapter *padapter) {struct list_head *plist, *phead;u8 *pibss =NULL ; -struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct __queue *queue = &pmlmepriv->scanned_queue; +struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +struct __queue *queue = &pmlmepriv->scanned_queue;u8 ret = _SUCCESS;spin_lock_bh (&pmlmepriv->scanned_queue.lock);
@@ -308,8 +308,8 @@ u8 rtw_set_802_11_ssid(struct adapter *padapter, struct ndis_802_11_ssid *ssid)u8 rtw_set_802_11_infrastructure_mode (struct adapter *padapter,enum ndis_802_11_network_infra networktype) { -struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct wlan_network *cur_network = &pmlmepriv->cur_network; +struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +struct wlan_network *cur_network = &pmlmepriv->cur_network;enum ndis_802_11_network_infra *pold_state = &cur_network->network.InfrastructureMode; RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_notice_,
@@ -394,8 +394,8 @@ u8 rtw_set_802_11_disassociate(struct adapter *padapter)u8 rtw_set_802_11_bssid_list_scan (struct adapter *padapter,struct ndis_802_11_ssid *pssid,int ssid_max_num) { -struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -u8 res = true; +struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +u8 res = true;RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("+%s(), fw_state =%x\n" , __func__,get_fwstate (pmlmepriv)));
@@ -467,9 +467,9 @@ u8 rtw_set_802_11_authentication_mode(struct adapter *padapter, enum ndis_802_11u8 rtw_set_802_11_add_wep (struct adapter *padapter,struct ndis_802_11_wep *wep) { -int keyid, res; +int keyid, res;struct security_priv *psecuritypriv = &padapter->securitypriv; -u8 ret = _SUCCESS; +u8 ret = _SUCCESS; keyid = wep->KeyIndex &0x3fffffff ;
@@ -535,16 +535,16 @@ u8 rtw_set_802_11_add_wep(struct adapter *padapter, struct ndis_802_11_wep *wep)*/ u16 rtw_get_cur_max_rate (struct adapter *adapter) { -int i =0 ; -u8 *p; -u16 rate =0 , max_rate =0 ; -struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +int i =0 ; +u8 *p; +u16 rate =0 , max_rate =0 ; +struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;struct registry_priv *pregistrypriv = &adapter->registrypriv; -struct mlme_priv *pmlmepriv = &adapter->mlmepriv; -struct wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network; -u8 bw_40MHz =0 , short_GI_20 =0 , short_GI_40 =0 ; -u32 ht_ielen =0 ; +struct mlme_priv *pmlmepriv = &adapter->mlmepriv; +struct wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network; +u8 bw_40MHz =0 , short_GI_20 =0 , short_GI_40 =0 ; +u32 ht_ielen =0 ;if (!check_fwstate (pmlmepriv, _FW_LINKED) && !check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ))
Signature · 1 line
2.19.0
PATCH 4/8 staging: rtl8188eu: fix comparsions to true
In reply to Michael StraubeUse if(x) instead of if(x == true).
--- .../staging/rtl8188eu/core/rtw_ioctl_set.c | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ioctl_set.c +13 -13
@@ -67,7 +67,7 @@ u8 rtw_do_join(struct adapter *padapter)mod_timer (&pmlmepriv->assoc_timer, jiffies +msecs_to_jiffies (MAX_JOIN_TIMEOUT )); }else { -if (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true) { +if (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE )) {/* submit createbss_cmd to change to a ADHOC_MASTER */ /* pmlmepriv->lock has been acquired by caller... */
@@ -136,7 +136,7 @@ u8 rtw_set_802_11_bssid(struct adapter *padapter, u8 *bssid)spin_lock_bh (&pmlmepriv->lock);DBG_88E ("Set BSSID under fw_state = 0x%08x\n" ,get_fwstate (pmlmepriv)); -if (check_fwstate (pmlmepriv, _FW_UNDER_SURVEY) == true) +if (check_fwstate (pmlmepriv, _FW_UNDER_SURVEY)) goto handle_tkip_countermeasure;else if (check_fwstate (pmlmepriv, _FW_UNDER_LINKING)) goto release_mlme_lock;
@@ -154,12 +154,12 @@ u8 rtw_set_802_11_bssid(struct adapter *padapter, u8 *bssid)rtw_disassoc_cmd (padapter,0 , true); -if (check_fwstate (pmlmepriv, _FW_LINKED) == true) +if (check_fwstate (pmlmepriv, _FW_LINKED))rtw_indicate_disconnect (padapter);rtw_free_assoc_resources (padapter); -if ((check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true)) { +if (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE )) {_clr_fwstate_ (pmlmepriv,WIFI_ADHOC_MASTER_STATE );set_fwstate (pmlmepriv,WIFI_ADHOC_STATE ); }
@@ -220,9 +220,9 @@ u8 rtw_set_802_11_ssid(struct adapter *padapter, struct ndis_802_11_ssid *ssid)spin_lock_bh (&pmlmepriv->lock);DBG_88E ("Set SSID under fw_state = 0x%08x\n" ,get_fwstate (pmlmepriv)); -if (check_fwstate (pmlmepriv, _FW_UNDER_SURVEY) == true) +if (check_fwstate (pmlmepriv, _FW_UNDER_SURVEY)) goto handle_tkip_countermeasure; -else if (check_fwstate (pmlmepriv, _FW_UNDER_LINKING) == true) +else if (check_fwstate (pmlmepriv, _FW_UNDER_LINKING)) goto release_mlme_lock;if (check_fwstate (pmlmepriv, _FW_LINKED|WIFI_ADHOC_MASTER_STATE )) {
@@ -240,12 +240,12 @@ u8 rtw_set_802_11_ssid(struct adapter *padapter, struct ndis_802_11_ssid *ssid)/* if in WIFI_ADHOC_MASTER_STATE | WIFI_ADHOC_STATE, create bss or rejoin again */ rtw_disassoc_cmd (padapter,0 , true); -if (check_fwstate (pmlmepriv, _FW_LINKED) == true) +if (check_fwstate (pmlmepriv, _FW_LINKED))rtw_indicate_disconnect (padapter);rtw_free_assoc_resources (padapter); -if (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true) { +if (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE )) {_clr_fwstate_ (pmlmepriv,WIFI_ADHOC_MASTER_STATE );set_fwstate (pmlmepriv,WIFI_ADHOC_STATE ); }
@@ -262,12 +262,12 @@ u8 rtw_set_802_11_ssid(struct adapter *padapter, struct ndis_802_11_ssid *ssid)rtw_disassoc_cmd (padapter,0 , true); -if (check_fwstate (pmlmepriv, _FW_LINKED) == true) +if (check_fwstate (pmlmepriv, _FW_LINKED))rtw_indicate_disconnect (padapter);rtw_free_assoc_resources (padapter); -if (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true) { +if (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE )) {_clr_fwstate_ (pmlmepriv,WIFI_ADHOC_MASTER_STATE );set_fwstate (pmlmepriv,WIFI_ADHOC_STATE ); }
@@ -291,7 +291,7 @@ u8 rtw_set_802_11_ssid(struct adapter *padapter, struct ndis_802_11_ssid *ssid)memcpy (&pmlmepriv->assoc_ssid, ssid,sizeof (struct ndis_802_11_ssid )); pmlmepriv->assoc_by_bssid = false; -if (check_fwstate (pmlmepriv, _FW_UNDER_SURVEY) == true) +if (check_fwstate (pmlmepriv, _FW_UNDER_SURVEY)) pmlmepriv->to_join = true;else status =rtw_do_join (padapter);
@@ -340,7 +340,7 @@ u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter,rtw_free_assoc_resources (padapter);if (*pold_state == Ndis802_11Infrastructure || *pold_state == Ndis802_11IBSS) { -if (check_fwstate (pmlmepriv, _FW_LINKED) == true) +if (check_fwstate (pmlmepriv, _FW_LINKED))rtw_indicate_disconnect (padapter);/* will clr Linked_state; before this function, we must have checked whether issue dis-assoc_cmd or not */ }
@@ -416,7 +416,7 @@ u8 rtw_set_802_11_bssid_list_scan(struct adapter *padapter, struct ndis_802_11_s res = true;if (check_fwstate (pmlmepriv, - (_FW_UNDER_SURVEY|_FW_UNDER_LINKING)) == true) + _FW_UNDER_SURVEY|_FW_UNDER_LINKING))RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("\n###_FW_UNDER_SURVEY|_FW_UNDER_LINKING\n\n" ));else RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("\n###pmlmepriv->sitesurveyctrl.traffic_busy == true\n\n" ));
Signature · 1 line
2.19.0
PATCH 5/8 staging: rtl8188eu: fix comparsions to false
In reply to Michael StraubeUse if(!x) instead of if(x == false).
--- drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ioctl_set.c +2 -2
@@ -145,7 +145,7 @@ u8 rtw_set_802_11_bssid(struct adapter *padapter, u8 *bssid)RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_info_, ("set_bssid: _FW_LINKED||WIFI_ADHOC_MASTER_STATE\n" ));if (!memcmp (&pmlmepriv->cur_network.network.MacAddress, bssid,ETH_ALEN )) { -if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ) == false) +if (!check_fwstate (pmlmepriv,WIFI_STATION_STATE )) goto release_mlme_lock;/* it means driver is in WIFI_ADHOC_MASTER_STATE, we needn't create bss again. */ }else {RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_info_, ("Set BSSID not the same bssid\n" ));
@@ -231,7 +231,7 @@ u8 rtw_set_802_11_ssid(struct adapter *padapter, struct ndis_802_11_ssid *ssid)if (pmlmepriv->assoc_ssid.SsidLength == ssid->SsidLength && !memcmp (&pmlmepriv->assoc_ssid.Ssid, ssid->Ssid, ssid->SsidLength)) { -if ((check_fwstate (pmlmepriv,WIFI_STATION_STATE ) == false)) { +if (!check_fwstate (pmlmepriv,WIFI_STATION_STATE )) {RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("Set SSID is the same ssid, fw_state = 0x%08x\n" ,get_fwstate (pmlmepriv)));
Signature · 1 line
2.19.0
PATCH 6/8 staging: rtl8188eu: add missing spaces around operators
In reply to Michael StraubeAdd missing spaces around '|', '-', and '&' to follow kernel coding style. Reported by checkpatch.
--- drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ioctl_set.c +7 -7
@@ -141,7 +141,7 @@ u8 rtw_set_802_11_bssid(struct adapter *padapter, u8 *bssid)else if (check_fwstate (pmlmepriv, _FW_UNDER_LINKING)) goto release_mlme_lock; -if (check_fwstate (pmlmepriv, _FW_LINKED|WIFI_ADHOC_MASTER_STATE )) { +if (check_fwstate (pmlmepriv, _FW_LINKED |WIFI_ADHOC_MASTER_STATE )) {RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_info_, ("set_bssid: _FW_LINKED||WIFI_ADHOC_MASTER_STATE\n" ));if (!memcmp (&pmlmepriv->cur_network.network.MacAddress, bssid,ETH_ALEN )) {
@@ -225,7 +225,7 @@ u8 rtw_set_802_11_ssid(struct adapter *padapter, struct ndis_802_11_ssid *ssid)else if (check_fwstate (pmlmepriv, _FW_UNDER_LINKING)) goto release_mlme_lock; -if (check_fwstate (pmlmepriv, _FW_LINKED|WIFI_ADHOC_MASTER_STATE )) { +if (check_fwstate (pmlmepriv, _FW_LINKED |WIFI_ADHOC_MASTER_STATE )) {RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_info_, ("set_ssid: _FW_LINKED||WIFI_ADHOC_MASTER_STATE\n" ));
@@ -409,14 +409,14 @@ u8 rtw_set_802_11_bssid_list_scan(struct adapter *padapter, struct ndis_802_11_s goto exit; } -if (check_fwstate (pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) || +if (check_fwstate (pmlmepriv, _FW_UNDER_SURVEY | _FW_UNDER_LINKING) || pmlmepriv->LinkDetectInfo.bBusyTraffic) {/* Scan or linking is in progress, do nothing. */ RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("%s fail since fw_state = %x\n" , __func__,get_fwstate (pmlmepriv))); res = true;if (check_fwstate (pmlmepriv, - _FW_UNDER_SURVEY|_FW_UNDER_LINKING)) + _FW_UNDER_SURVEY | _FW_UNDER_LINKING))RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("\n###_FW_UNDER_SURVEY|_FW_UNDER_LINKING\n\n" ));else RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_err_, ("\n###pmlmepriv->sitesurveyctrl.traffic_busy == true\n\n" ));
@@ -550,8 +550,8 @@ u16 rtw_get_cur_max_rate(struct adapter *adapter) !check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE))return 0 ; -if (pmlmeext->cur_wireless_mode & (WIRELESS_11_24N |WIRELESS_11_5N )) { - p =rtw_get_ie (&pcur_bss->ies[12 ], _HT_CAPABILITY_IE_, &ht_ielen, pcur_bss->ie_length-12 ); +if (pmlmeext->cur_wireless_mode & (WIRELESS_11_24N |WIRELESS_11_5N )) { + p =rtw_get_ie (&pcur_bss->ies[12 ], _HT_CAPABILITY_IE_, &ht_ielen, pcur_bss->ie_length -12 );if (p && ht_ielen >0 ) {/* cur_bwmod is updated by beacon, pmlmeinfo is updated by association response */ bw_40MHz = (pmlmeext->cur_bwmode && (HT_INFO_HT_PARAM_REC_TRANS_CHNL_WIDTH & pmlmeinfo->HT_info.infos[0 ])) ?1 :0 ;
@@ -569,7 +569,7 @@ u16 rtw_get_cur_max_rate(struct adapter *adapter) } }else {while (pcur_bss->SupportedRates[i] !=0 && pcur_bss->SupportedRates[i] !=0xFF ) { - rate = pcur_bss->SupportedRates[i]&0x7F ; + rate = pcur_bss->SupportedRates[i] &0x7F ;if (rate > max_rate) max_rate = rate; i++;
Signature · 1 line
2.19.0
PATCH 7/8 staging: rtl8188eu: fix lines over 80 characters
In reply to Michael StraubeWrap lines over 80 characters where appropriate to clear checkpatch warnings.
--- drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ioctl_set.c +10 -5
@@ -339,7 +339,8 @@ u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter, check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE))rtw_free_assoc_resources (padapter); -if (*pold_state == Ndis802_11Infrastructure || *pold_state == Ndis802_11IBSS) { +if (*pold_state == Ndis802_11Infrastructure || + *pold_state == Ndis802_11IBSS) {if (check_fwstate (pmlmepriv, _FW_LINKED))rtw_indicate_disconnect (padapter);/* will clr Linked_state; before this function, we must have checked whether issue dis-assoc_cmd or not */ }
@@ -444,7 +445,8 @@ u8 rtw_set_802_11_authentication_mode(struct adapter *padapter, enum ndis_802_11int res;u8 ret; -RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_info_, ("set_802_11_auth.mode(): mode =%x\n" , authmode)); +RT_TRACE (_module_rtl871x_ioctl_set_c_, _drv_info_, + ("set_802_11_auth.mode(): mode =%x\n" , authmode)); psecuritypriv->ndisauthtype = authmode;
@@ -497,7 +499,8 @@ u8 rtw_set_802_11_add_wep(struct adapter *padapter, struct ndis_802_11_wep *wep) ("rtw_set_802_11_add_wep:before memcpy, wep->KeyLength = 0x%x wep->KeyIndex = 0x%x keyid =%x\n" , wep->KeyLength, wep->KeyIndex, keyid)); -memcpy (&psecuritypriv->dot11DefKey[keyid].skey[0 ], &wep->KeyMaterial, wep->KeyLength); +memcpy (&psecuritypriv->dot11DefKey[keyid].skey[0 ], + &wep->KeyMaterial, wep->KeyLength); psecuritypriv->dot11DefKeylen[keyid] = wep->KeyLength;
@@ -551,7 +554,8 @@ u16 rtw_get_cur_max_rate(struct adapter *adapter)return 0 ;if (pmlmeext->cur_wireless_mode & (WIRELESS_11_24N |WIRELESS_11_5N )) { - p =rtw_get_ie (&pcur_bss->ies[12 ], _HT_CAPABILITY_IE_, &ht_ielen, pcur_bss->ie_length -12 ); + p =rtw_get_ie (&pcur_bss->ies[12 ], _HT_CAPABILITY_IE_, + &ht_ielen, pcur_bss->ie_length -12 );if (p && ht_ielen >0 ) {/* cur_bwmod is updated by beacon, pmlmeinfo is updated by association response */ bw_40MHz = (pmlmeext->cur_bwmode && (HT_INFO_HT_PARAM_REC_TRANS_CHNL_WIDTH & pmlmeinfo->HT_info.infos[0 ])) ?1 :0 ;
@@ -568,7 +572,8 @@ u16 rtw_get_cur_max_rate(struct adapter *adapter) ); } }else { -while (pcur_bss->SupportedRates[i] !=0 && pcur_bss->SupportedRates[i] !=0xFF ) { +while (pcur_bss->SupportedRates[i] !=0 && + pcur_bss->SupportedRates[i] !=0xFF ) { rate = pcur_bss->SupportedRates[i] &0x7F ;if (rate > max_rate) max_rate = rate;
Signature · 1 line
2.19.0
PATCH 8/8 staging: rtl8188eu: simplify function comments
In reply to Michael StraubeSimplify function comments to a single line.
--- drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ioctl_set.c +2 -13
@@ -530,12 +530,7 @@ u8 rtw_set_802_11_add_wep(struct adapter *padapter, struct ndis_802_11_wep *wep)return ret; } -/* -* rtw_get_cur_max_rate - -* @adapter: pointer to struct adapter structure -* -* Return 0 or 100Kbps -*/ +/* Return 0 or 100Kbps */ u16 rtw_get_cur_max_rate (struct adapter *adapter) {int i =0 ;
@@ -586,13 +581,7 @@ u16 rtw_get_cur_max_rate(struct adapter *adapter)return max_rate; } -/* -* rtw_set_country - -* @adapter: pointer to struct adapter structure -* @country_code: string of country code -* -* Return _SUCCESS or _FAIL -*/ +/* Return _SUCCESS or _FAIL */ int rtw_set_country (struct adapter *adapter,const char *country_code) {int i;
Signature · 1 line
2.19.0