staging: rtl8188eu: cleanup remaining comparsions to true
PATCH 1/9 staging: rtl8188eu: cleanup remaining comparsions to true
Cleanup remaining comparsions to true.
if (x == true) -> if (x)
if (x != true) -> if (!x)
if (!x == true) -> if (!x)
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/rtl8188eu/core/rtw_ap.c | 4 +-- drivers/staging/rtl8188eu/core/rtw_cmd.c | 10 +++--- drivers/staging/rtl8188eu/core/rtw_mlme.c | 26 +++++++------- drivers/staging/rtl8188eu/core/rtw_recv.c | 16 ++++----- drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 2 +- .../staging/rtl8188eu/core/rtw_wlan_util.c | 2 +- drivers/staging/rtl8188eu/core/rtw_xmit.c | 7 ++-- drivers/staging/rtl8188eu/include/rtw_mlme.h | 2 +- .../staging/rtl8188eu/os_dep/ioctl_linux.c | 36 +++++++++---------- 9 files changed, 53 insertions(+), 52 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ap.c +2 -2
@@ -629,7 +629,7 @@ static void start_bss_network(struct adapter *padapter, u8 *pbuf) }/* setting only at first time */ -if (pmlmepriv->cur_network.join_res != true) { +if (!pmlmepriv->cur_network.join_res) {/* WEP Key will be set before this function, do not * clear CAM. */
@@ -756,7 +756,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)DBG_88E ("%s, len =%d\n" , __func__, len); -if (check_fwstate (pmlmepriv,WIFI_AP_STATE ) != true) +if (!check_fwstate (pmlmepriv,WIFI_AP_STATE ))return _FAIL;if (len <0 || len >MAX_IE_SZ )
drivers/staging/rtl8188eu/core/rtw_cmd.c +5 -5
@@ -240,7 +240,7 @@ u8 rtw_sitesurvey_cmd(struct adapter *padapter, struct ndis_802_11_ssid *ssid,struct cmd_priv *pcmdpriv = &padapter->cmdpriv;struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -if (check_fwstate (pmlmepriv, _FW_LINKED) == true) +if (check_fwstate (pmlmepriv, _FW_LINKED))rtw_lps_ctrl_wk_cmd (padapter,LPS_CTRL_SCAN ,1 ); ph2c =kzalloc (sizeof (*ph2c),GFP_ATOMIC );
@@ -820,7 +820,7 @@ static void dynamic_chk_wk_hdl(struct adapter *padapter, u8 *pbuf, int sz) pmlmepriv = &padapter->mlmepriv;#ifdef CONFIG_88EU_AP_MODE -if (check_fwstate (pmlmepriv,WIFI_AP_STATE ) == true) +if (check_fwstate (pmlmepriv,WIFI_AP_STATE ))expire_timeout_chk (padapter);#endif
@@ -836,13 +836,13 @@ static void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type)struct mlme_priv *pmlmepriv = &padapter->mlmepriv;u8 mstatus; -if ((check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true) || - (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true)) +if (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) || +check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ))return ;switch (lps_ctrl_type) {case LPS_CTRL_SCAN : -if (check_fwstate (pmlmepriv, _FW_LINKED) == true) { +if (check_fwstate (pmlmepriv, _FW_LINKED)) {/* connect */ LPS_Leave (padapter); }
drivers/staging/rtl8188eu/core/rtw_mlme.c +13 -13
@@ -315,8 +315,8 @@ int is_same_network(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst) d_cap =le16_to_cpu (le_dcap); return ((src->Ssid.SsidLength == dst->Ssid.SsidLength) && - ((!memcmp(src->MacAddress, dst->MacAddress, ETH_ALEN)) == true) && - ((!memcmp(src->Ssid.Ssid, dst->Ssid.Ssid, src->Ssid.SsidLength)) == true) && + (!memcmp(src->MacAddress, dst->MacAddress, ETH_ALEN)) && + (!memcmp(src->Ssid.Ssid, dst->Ssid.Ssid, src->Ssid.SsidLength)) && ((s_cap & WLAN_CAPABILITY_IBSS) == (d_cap & WLAN_CAPABILITY_IBSS)) && ((s_cap & WLAN_CAPABILITY_ESS) ==
@@ -386,8 +386,8 @@ static void update_current_network(struct adapter *adapter, struct wlan_bssid_ex {struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); -if ((check_fwstate (pmlmepriv, _FW_LINKED) == true) && - (is_same_network (&(pmlmepriv->cur_network.network), pnetwork))) { +if (check_fwstate (pmlmepriv, _FW_LINKED) && +is_same_network (&pmlmepriv->cur_network.network, pnetwork)) {update_network (&(pmlmepriv->cur_network.network), pnetwork, adapter, true);rtw_update_protection (adapter, (pmlmepriv->cur_network.network.ies) +sizeof (struct ndis_802_11_fixed_ie ), pmlmepriv->cur_network.network.ie_length);
@@ -529,7 +529,7 @@ static int rtw_is_desired_network(struct adapter *adapter, struct wlan_network * bselected = false; } -if (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true) { +if (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE )) {if (pnetwork->network.InfrastructureMode != pmlmepriv->cur_network.network.InfrastructureMode) bselected = false; }
@@ -561,7 +561,7 @@ void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf)spin_lock_bh (&pmlmepriv->lock);/* update IBSS_network 's timestamp */ -if ((check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE )) == true) { +if (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE )) {if (!memcmp (&(pmlmepriv->cur_network.network.MacAddress), pnetwork->MacAddress,ETH_ALEN )) {struct wlan_network *ibss_wlan =NULL ;
@@ -614,7 +614,7 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)rtw_set_signal_stat_timer (&adapter->recvpriv);if (pmlmepriv->to_join) { -if ((check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true)) { +if (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE )) {if (!check_fwstate (pmlmepriv, _FW_LINKED)) {set_fwstate (pmlmepriv, _FW_UNDER_LINKING);
@@ -1005,14 +1005,14 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf) } ptarget_wlan =rtw_find_network (&pmlmepriv->scanned_queue, pnetwork->network.MacAddress); -if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ) == true) { +if (check_fwstate (pmlmepriv,WIFI_STATION_STATE )) {if (ptarget_wlan) ptarget_wlan->fixed = true; } } }else { ptarget_wlan =rtw_find_network (&pmlmepriv->scanned_queue, pnetwork->network.MacAddress); -if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ) == true) { +if (check_fwstate (pmlmepriv,WIFI_STATION_STATE )) {if (ptarget_wlan) ptarget_wlan->fixed = true; }
@@ -1028,7 +1028,7 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf) }/* s3. find ptarget_sta & update ptarget_sta after update cur_network only for station mode */ -if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ) == true) { +if (check_fwstate (pmlmepriv,WIFI_STATION_STATE )) { ptarget_sta =rtw_joinbss_update_stainfo (adapter, pnetwork);if (!ptarget_sta) {RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("Can't update stainfo when joinbss_event callback\n" ));
@@ -1038,7 +1038,7 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf) }/* s4. indicate connect */ -if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ) == true) { +if (check_fwstate (pmlmepriv,WIFI_STATION_STATE )) {rtw_indicate_connect (adapter); }else {/* adhoc mode will rtw_indicate_connect when rtw_stassoc_event_callback */
@@ -1063,7 +1063,7 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)mod_timer (&pmlmepriv->assoc_timer, jiffies +msecs_to_jiffies (1 )); -if ((check_fwstate (pmlmepriv, _FW_UNDER_LINKING)) == true) { +if (check_fwstate (pmlmepriv, _FW_UNDER_LINKING)) {RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("fail! clear _FW_UNDER_LINKING ^^^fw_state=%x\n" ,get_fwstate (pmlmepriv)));_clr_fwstate_ (pmlmepriv, _FW_UNDER_LINKING); }
@@ -1488,7 +1488,7 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv) }/* check for situation of _FW_LINKED */ -if (check_fwstate (pmlmepriv, _FW_LINKED) == true) { +if (check_fwstate (pmlmepriv, _FW_LINKED)) {DBG_88E ("%s: _FW_LINKED while ask_for_joinbss!!!\n" , __func__);rtw_disassoc_cmd (adapter,0 , true);
drivers/staging/rtl8188eu/core/rtw_recv.c +8 -8
@@ -650,8 +650,8 @@ int sta2sta_data_frame(struct adapter *adapter, struct recv_frame *precv_frame,u8 *sta_addr =NULL ;bool mcast =is_multicast_ether_addr (pattrib->dst); -if ((check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true) || - (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true)) { +if (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) || +check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE )) {/* filter packets that SA is myself or multicast or broadcast */ if (!memcmp (myhwaddr, pattrib->src,ETH_ALEN )) {RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, (" SA==myself\n" ));
@@ -729,9 +729,9 @@ static int ap2sta_data_frame(u8 *myhwaddr =myid (&adapter->eeprompriv);bool mcast =is_multicast_ether_addr (pattrib->dst); -if ((check_fwstate (pmlmepriv,WIFI_STATION_STATE ) == true) && - (check_fwstate (pmlmepriv, _FW_LINKED) == true || -check_fwstate (pmlmepriv, _FW_UNDER_LINKING))) { +if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ) && + (check_fwstate (pmlmepriv, _FW_LINKED) || +check_fwstate (pmlmepriv, _FW_UNDER_LINKING))) {/* filter packets that SA is myself or multicast or broadcast */ if (!memcmp (myhwaddr, pattrib->src,ETH_ALEN )) {RT_TRACE (_module_rtl871x_recv_c_, _drv_err_, (" SA==myself\n" ));
@@ -817,7 +817,7 @@ static int sta2ap_data_frame(struct adapter *adapter,unsigned char *mybssid =get_bssid (pmlmepriv);int ret = _SUCCESS; -if (check_fwstate (pmlmepriv,WIFI_AP_STATE ) == true) { +if (check_fwstate (pmlmepriv,WIFI_AP_STATE )) {/* For AP mode, RA = BSSID, TX = STA(SRC_ADDR), A3 = DST_ADDR */ if (memcmp (pattrib->bssid, mybssid,ETH_ALEN )) { ret = _FAIL;
@@ -949,7 +949,7 @@ static int validate_recv_ctrl_frame(struct adapter *padapter, pxmitframe->attrib.triggered =1 ;spin_unlock_bh (&psta->sleep_q.lock); -if (rtw_hal_xmit (padapter, pxmitframe) == true) +if (rtw_hal_xmit (padapter, pxmitframe))rtw_os_xmit_complete (padapter, pxmitframe);spin_lock_bh (&psta->sleep_q.lock);
@@ -1838,7 +1838,7 @@ void rtw_reordering_ctrl_timeout_handler(struct timer_list *t)spin_lock_bh (&ppending_recvframe_queue->lock); -if (recv_indicatepkts_in_order (padapter, preorder_ctrl, true) == true) +if (recv_indicatepkts_in_order (padapter, preorder_ctrl, true))mod_timer (&preorder_ctrl->reordering_ctrl_timer, jiffies +msecs_to_jiffies (REORDER_WAIT_TIME ));
drivers/staging/rtl8188eu/core/rtw_sta_mgt.c +1 -1
@@ -429,7 +429,7 @@ struct sta_info *rtw_get_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)while (phead != plist) { psta = container_of(plist, struct sta_info, hash_list); -if ((!memcmp (psta->hwaddr, addr,ETH_ALEN )) == true) { +if (!memcmp (psta->hwaddr, addr,ETH_ALEN )) {/* if found the matched address */ break ; }
drivers/staging/rtl8188eu/core/rtw_wlan_util.c +1 -1
@@ -190,7 +190,7 @@ static unsigned int ratetbl2rateset(struct adapter *padapter, unsigned char *ratdefault : rate =ratetbl_val_2wifirate (rate); -if (is_basicrate (padapter, rate) == true) +if (is_basicrate (padapter, rate)) rate |=IEEE80211_BASIC_RATE_MASK ; rateset[len] = rate;
drivers/staging/rtl8188eu/core/rtw_xmit.c +4 -3
@@ -467,7 +467,8 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct pRT_TRACE (_module_rtl871x_xmit_c_, _drv_alert_, ("\nupdate_attrib => get sta_info fail, ra: %pM\n" , (pattrib->ra))); res = _FAIL; goto exit; - }else if ((check_fwstate (pmlmepriv,WIFI_AP_STATE ) == true) && (!(psta->state & _FW_LINKED))) { + }else if (check_fwstate (pmlmepriv,WIFI_AP_STATE ) && + !(psta->state & _FW_LINKED)) { res = _FAIL; goto exit; }
@@ -758,7 +759,7 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattrSetFrameSubType (fctrl, pattrib->subtype);if (pattrib->subtype &WIFI_DATA_TYPE ) { -if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ) == true) { +if (check_fwstate (pmlmepriv,WIFI_STATION_STATE )) {/* to_ds = 1, fr_ds = 0; */ /* Data transfer to AP */ SetToDs (fctrl);
@@ -1984,7 +1985,7 @@ void xmit_delivery_enabled_frames(struct adapter *padapter, struct sta_info *pst pxmitframe->attrib.triggered =1 ; -if (rtw_hal_xmit (padapter, pxmitframe) == true) +if (rtw_hal_xmit (padapter, pxmitframe))rtw_os_xmit_complete (padapter, pxmitframe);if ((psta->sleepq_ac_len ==0 ) && (!psta->has_legacy_ac) && (wmmps_ac)) {
drivers/staging/rtl8188eu/include/rtw_mlme.h +1 -1
@@ -285,7 +285,7 @@ static inline void _clr_fwstate_(struct mlme_priv *pmlmepriv, int state)static inline void clr_fwstate (struct mlme_priv *pmlmepriv,int state) {spin_lock_bh (&pmlmepriv->lock); -if (check_fwstate (pmlmepriv, state) == true) +if (check_fwstate (pmlmepriv, state)) pmlmepriv->fw_state ^= state;spin_unlock_bh (&pmlmepriv->lock); }
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c +18 -18
@@ -296,7 +296,7 @@ static char *translate_scan(struct adapter *padapter, iwe.cmd =IWEVQUAL ; iwe.u.qual.updated =IW_QUAL_QUAL_UPDATED |IW_QUAL_LEVEL_UPDATED |IW_QUAL_NOISE_INVALID ; -if (check_fwstate (pmlmepriv, _FW_LINKED) == true && +if (check_fwstate (pmlmepriv, _FW_LINKED) &&is_same_network (&pmlmepriv->cur_network.network, &pnetwork->network)) { ss = padapter->recvpriv.signal_strength; sq = padapter->recvpriv.signal_qual;
@@ -631,7 +631,7 @@ static int rtw_wx_get_name(struct net_device *dev,RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("cmd_code =%x\n" , info->cmd)); -if (check_fwstate (pmlmepriv, _FW_LINKED|WIFI_ADHOC_MASTER_STATE ) == true) { +if (check_fwstate (pmlmepriv, _FW_LINKED |WIFI_ADHOC_MASTER_STATE )) {/* parsing HT_CAP_IE */ p =rtw_get_ie (&pcur_bss->ies[12 ], _HT_CAPABILITY_IE_, &ht_ielen, pcur_bss->ie_length-12 );if (p && ht_ielen >0 )
@@ -1024,9 +1024,9 @@ static int rtw_wx_get_wap(struct net_device *dev,RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("rtw_wx_get_wap\n" )); -if (((check_fwstate (pmlmepriv, _FW_LINKED)) == true) || - ((check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE )) == true) || - ((check_fwstate (pmlmepriv,WIFI_AP_STATE )) == true)) +if (check_fwstate (pmlmepriv, _FW_LINKED) || +check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) || +check_fwstate (pmlmepriv,WIFI_AP_STATE ))memcpy (wrqu->ap_addr.sa_data, pcur_bss->MacAddress,ETH_ALEN );else eth_zero_addr (wrqu->ap_addr.sa_data);
@@ -1335,7 +1335,7 @@ static int rtw_wx_set_essid(struct net_device *dev,RT_TRACE (_module_rtl871x_ioctl_os_c, _drv_info_, ("rtw_wx_set_essid: find match, set infra mode\n" )); -if (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true) { +if (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE )) {if (pnetwork->network.InfrastructureMode != pmlmepriv->cur_network.network.InfrastructureMode)continue ; }
@@ -1691,7 +1691,7 @@ static int rtw_wx_get_enc(struct net_device *dev,struct iw_point *erq = &(wrqu->encoding);struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -if (check_fwstate (pmlmepriv, _FW_LINKED) != true) { +if (!check_fwstate (pmlmepriv, _FW_LINKED)) {if (!check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE )) { erq->length =0 ; erq->flags |=IW_ENCODE_DISABLED ;
@@ -2425,7 +2425,7 @@ static int rtw_set_beacon(struct net_device *dev, struct ieee_param *param, intDBG_88E ("%s, len =%d\n" , __func__, len); -if (check_fwstate (pmlmepriv,WIFI_AP_STATE ) != true) +if (!check_fwstate (pmlmepriv,WIFI_AP_STATE ))return -EINVAL ;memcpy (&pstapriv->max_num_sta, param->u.bcn_ie.reserved,2 );
@@ -2517,7 +2517,7 @@ static int rtw_del_sta(struct net_device *dev, struct ieee_param *param)DBG_88E ("rtw_del_sta =%pM\n" , (param->sta_addr)); -if (check_fwstate (pmlmepriv, (_FW_LINKED|WIFI_AP_STATE )) != true) +if (!check_fwstate (pmlmepriv, _FW_LINKED |WIFI_AP_STATE ))return -EINVAL ;if (is_broadcast_ether_addr (param->sta_addr))
@@ -2553,7 +2553,7 @@ static int rtw_ioctl_get_sta_data(struct net_device *dev, struct ieee_param *parDBG_88E ("rtw_ioctl_get_sta_info, sta_addr: %pM\n" , (param_ex->sta_addr)); -if (check_fwstate (pmlmepriv, (_FW_LINKED|WIFI_AP_STATE )) != true) +if (!check_fwstate (pmlmepriv, _FW_LINKED |WIFI_AP_STATE ))return -EINVAL ;if (is_broadcast_ether_addr (param_ex->sta_addr))
@@ -2607,7 +2607,7 @@ static int rtw_get_sta_wpaie(struct net_device *dev, struct ieee_param *param)DBG_88E ("rtw_get_sta_wpaie, sta_addr: %pM\n" , (param->sta_addr)); -if (check_fwstate (pmlmepriv, (_FW_LINKED|WIFI_AP_STATE )) != true) +if (!check_fwstate (pmlmepriv, _FW_LINKED |WIFI_AP_STATE ))return -EINVAL ;if (is_broadcast_ether_addr (param->sta_addr))
@@ -2645,7 +2645,7 @@ static int rtw_set_wps_beacon(struct net_device *dev, struct ieee_param *param,DBG_88E ("%s, len =%d\n" , __func__, len); -if (check_fwstate (pmlmepriv,WIFI_AP_STATE ) != true) +if (!check_fwstate (pmlmepriv,WIFI_AP_STATE ))return -EINVAL ; ie_len = len-12 -2 ;/* 12 = param header, 2:no packed */
@@ -2680,7 +2680,7 @@ static int rtw_set_wps_probe_resp(struct net_device *dev, struct ieee_param *parDBG_88E ("%s, len =%d\n" , __func__, len); -if (check_fwstate (pmlmepriv,WIFI_AP_STATE ) != true) +if (!check_fwstate (pmlmepriv,WIFI_AP_STATE ))return -EINVAL ; ie_len = len-12 -2 ;/* 12 = param header, 2:no packed */
@@ -2710,7 +2710,7 @@ static int rtw_set_wps_assoc_resp(struct net_device *dev, struct ieee_param *parDBG_88E ("%s, len =%d\n" , __func__, len); -if (check_fwstate (pmlmepriv,WIFI_AP_STATE ) != true) +if (!check_fwstate (pmlmepriv,WIFI_AP_STATE ))return -EINVAL ; ie_len = len-12 -2 ;/* 12 = param header, 2:no packed */
@@ -2742,7 +2742,7 @@ static int rtw_set_hidden_ssid(struct net_device *dev, struct ieee_param *param,u8 value; -if (check_fwstate (pmlmepriv,WIFI_AP_STATE ) != true) +if (!check_fwstate (pmlmepriv,WIFI_AP_STATE ))return -EINVAL ;if (param->u.wpa_param.name !=0 )/* dummy test... */
@@ -2762,7 +2762,7 @@ static int rtw_ioctl_acl_remove_sta(struct net_device *dev, struct ieee_param *pstruct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev);struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -if (check_fwstate (pmlmepriv,WIFI_AP_STATE ) != true) +if (!check_fwstate (pmlmepriv,WIFI_AP_STATE ))return -EINVAL ;if (is_broadcast_ether_addr (param->sta_addr))
@@ -2776,7 +2776,7 @@ static int rtw_ioctl_acl_add_sta(struct net_device *dev, struct ieee_param *parastruct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev);struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -if (check_fwstate (pmlmepriv,WIFI_AP_STATE ) != true) +if (!check_fwstate (pmlmepriv,WIFI_AP_STATE ))return -EINVAL ;if (is_broadcast_ether_addr (param->sta_addr))
@@ -2791,7 +2791,7 @@ static int rtw_ioctl_set_macaddr_acl(struct net_device *dev, struct ieee_param *struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev);struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -if (check_fwstate (pmlmepriv,WIFI_AP_STATE ) != true) +if (!check_fwstate (pmlmepriv,WIFI_AP_STATE ))return -EINVAL ;rtw_set_macaddr_acl (padapter, param->u.mlme.command);
Signature · 1 line
2.19.2
PATCH 2/9 staging: rtl8188eu: remove unnecessary parentheses in rtw_mlme.c
Remove unnecessary parentheses reported by checkpatch.
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/rtl8188eu/core/rtw_mlme.c | 120 ++++++++++++---------- 1 file changed, 63 insertions(+), 57 deletions(-)
drivers/staging/rtl8188eu/core/rtw_mlme.c +63 -57
@@ -39,9 +39,9 @@ int rtw_init_mlme_priv(struct adapter *padapter) pmlmepriv->cur_network.network.InfrastructureMode = Ndis802_11AutoUnknown; pmlmepriv->scan_mode =SCAN_ACTIVE ;/* 1: active, 0: pasive. Maybe someday we should rename this varable to "active_mode" (Jeff) */ -spin_lock_init (&(pmlmepriv->lock)); -_rtw_init_queue (&(pmlmepriv->free_bss_pool)); -_rtw_init_queue (&(pmlmepriv->scanned_queue)); +spin_lock_init (&pmlmepriv->lock); +_rtw_init_queue (&pmlmepriv->free_bss_pool); +_rtw_init_queue (&pmlmepriv->scanned_queue);memset (&pmlmepriv->assoc_ssid,0 ,sizeof (struct ndis_802_11_ssid ));
@@ -56,9 +56,9 @@ int rtw_init_mlme_priv(struct adapter *padapter) pnetwork = (struct wlan_network *)pbuf;for (i =0 ; i <MAX_BSS_CNT ; i++) { -INIT_LIST_HEAD (&(pnetwork->list)); +INIT_LIST_HEAD (&pnetwork->list); -list_add_tail (&(pnetwork->list), &(pmlmepriv->free_bss_pool.queue)); +list_add_tail (&pnetwork->list, &pmlmepriv->free_bss_pool.queue); pnetwork++; }
@@ -137,7 +137,7 @@ static void _rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *unsigned long curr_time;u32 delta_time;u32 lifetime =SCANQUEUE_LIFETIME ; -struct __queue *free_queue = &(pmlmepriv->free_bss_pool); +struct __queue *free_queue = &pmlmepriv->free_bss_pool;if (!pnetwork)return ;
@@ -154,21 +154,21 @@ static void _rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *return ; }spin_lock_bh (&free_queue->lock); -list_del_init (&(pnetwork->list)); -list_add_tail (&(pnetwork->list), &(free_queue->queue)); +list_del_init (&pnetwork->list); +list_add_tail (&pnetwork->list, &free_queue->queue);spin_unlock_bh (&free_queue->lock); }void _rtw_free_network_nolock (struct mlme_priv *pmlmepriv,struct wlan_network *pnetwork) { -struct __queue *free_queue = &(pmlmepriv->free_bss_pool); +struct __queue *free_queue = &pmlmepriv->free_bss_pool;if (!pnetwork)return ;if (pnetwork->fixed)return ; -list_del_init (&(pnetwork->list)); -list_add_tail (&(pnetwork->list),get_list_head (free_queue)); +list_del_init (&pnetwork->list); +list_add_tail (&pnetwork->list,get_list_head (free_queue)); }/*
@@ -354,7 +354,8 @@ void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src,rtw_hal_antdiv_rssi_compared (padapter, dst, src);/* this will update src.Rssi, need consider again */ /* The rule below is 1/5 for sample value, 4/5 for history value */ -if (check_fwstate (&padapter->mlmepriv, _FW_LINKED) &&is_same_network (&(padapter->mlmepriv.cur_network.network), src)) { +if (check_fwstate (&padapter->mlmepriv, _FW_LINKED) && +is_same_network (&padapter->mlmepriv.cur_network.network, src)) {/* Take the recvpriv's value for the connected AP*/ ss_final = padapter->recvpriv.signal_strength; sq_final = padapter->recvpriv.signal_qual;
@@ -384,11 +385,11 @@ void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src,static void update_current_network (struct adapter *adapter,struct wlan_bssid_ex *pnetwork) { -struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); +struct mlme_priv *pmlmepriv = &adapter->mlmepriv;if (check_fwstate (pmlmepriv, _FW_LINKED) &&is_same_network (&pmlmepriv->cur_network.network, pnetwork)) { -update_network (&(pmlmepriv->cur_network.network), pnetwork, adapter, true); +update_network (&pmlmepriv->cur_network.network, pnetwork, adapter, true);rtw_update_protection (adapter, (pmlmepriv->cur_network.network.ies) +sizeof (struct ndis_802_11_fixed_ie ), pmlmepriv->cur_network.network.ie_length); }
@@ -401,8 +402,8 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t {struct list_head *plist, *phead;u32 bssid_ex_sz; -struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); -struct __queue *queue = &(pmlmepriv->scanned_queue); +struct mlme_priv *pmlmepriv = &adapter->mlmepriv; +struct __queue *queue = &pmlmepriv->scanned_queue;struct wlan_network *pnetwork =NULL ;struct wlan_network *oldest =NULL ;
@@ -413,7 +414,7 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *twhile (phead != plist) { pnetwork = container_of(plist, struct wlan_network, list); -if (is_same_network (&(pnetwork->network), target)) +if (is_same_network (&pnetwork->network, target))break ;if ((oldest == ((struct wlan_network *)0 )) ||time_after (oldest->last_scanned, pnetwork->last_scanned))
@@ -424,12 +425,14 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t* with this beacon's information */ if (phead == plist) { -if (list_empty (&(pmlmepriv->free_bss_pool.queue))) { +if (list_empty (&pmlmepriv->free_bss_pool.queue)) {/* If there are no more slots, expire the oldest */ pnetwork = oldest; -rtw_hal_get_def_var (adapter,HAL_DEF_CURRENT_ANTENNA , &(target->PhyInfo.Optimum_antenna)); -memcpy (&(pnetwork->network), target,get_wlan_bssid_ex_sz (target)); +rtw_hal_get_def_var (adapter,HAL_DEF_CURRENT_ANTENNA , + &target->PhyInfo.Optimum_antenna); +memcpy (&pnetwork->network, target, +get_wlan_bssid_ex_sz (target));/* variable initialize */ pnetwork->fixed = false; pnetwork->last_scanned = jiffies;
@@ -453,15 +456,16 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t bssid_ex_sz =get_wlan_bssid_ex_sz (target); target->Length = bssid_ex_sz; -rtw_hal_get_def_var (adapter,HAL_DEF_CURRENT_ANTENNA , &(target->PhyInfo.Optimum_antenna)); -memcpy (&(pnetwork->network), target, bssid_ex_sz); +rtw_hal_get_def_var (adapter,HAL_DEF_CURRENT_ANTENNA , + &target->PhyInfo.Optimum_antenna); +memcpy (&pnetwork->network, target, bssid_ex_sz); pnetwork->last_scanned = jiffies;/* bss info not receiving from the right channel */ if (pnetwork->network.PhyInfo.SignalQuality ==101 ) pnetwork->network.PhyInfo.SignalQuality =0 ; -list_add_tail (&(pnetwork->list), &(queue->queue)); +list_add_tail (&pnetwork->list, &queue->queue); } }else {/* we have an entry and we are going to update it. But this entry may
@@ -476,7 +480,7 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *tif ((pnetwork->network.ie_length > target->ie_length) && (target->Reserved[0 ] ==1 )) update_ie = false; -update_network (&(pnetwork->network), target, adapter, update_ie); +update_network (&pnetwork->network, target, adapter, update_ie); } exit:
@@ -547,7 +551,7 @@ void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf) {u32 len;struct wlan_bssid_ex *pnetwork; -struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); +struct mlme_priv *pmlmepriv = &adapter->mlmepriv; pnetwork = (struct wlan_bssid_ex *)pbuf;
@@ -562,11 +566,11 @@ void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf)/* update IBSS_network 's timestamp */ if (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE )) { -if (!memcmp (&(pmlmepriv->cur_network.network.MacAddress), pnetwork->MacAddress,ETH_ALEN )) { +if (!memcmp (&pmlmepriv->cur_network.network.MacAddress, pnetwork->MacAddress,ETH_ALEN )) {struct wlan_network *ibss_wlan =NULL ;memcpy (pmlmepriv->cur_network.network.ies, pnetwork->ies,8 ); -spin_lock_bh (&(pmlmepriv->scanned_queue.lock)); +spin_lock_bh (&pmlmepriv->scanned_queue.lock); ibss_wlan =rtw_find_network (&pmlmepriv->scanned_queue, pnetwork->MacAddress);if (ibss_wlan) {memcpy (ibss_wlan->network.ies, pnetwork->ies,8 );
@@ -592,7 +596,7 @@ void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf)void rtw_surveydone_event_callback (struct adapter *adapter,u8 *pbuf) { -struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); +struct mlme_priv *pmlmepriv = &adapter->mlmepriv;spin_lock_bh (&pmlmepriv->lock);
@@ -622,7 +626,7 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)mod_timer (&pmlmepriv->assoc_timer, jiffies +msecs_to_jiffies (MAX_JOIN_TIMEOUT )); }else { -struct wlan_bssid_ex *pdev_network = &(adapter->registrypriv.dev_network); +struct wlan_bssid_ex *pdev_network = &adapter->registrypriv.dev_network;u8 *pibss = adapter->registrypriv.dev_network.MacAddress;_clr_fwstate_ (pmlmepriv, _FW_UNDER_SURVEY);
@@ -741,7 +745,7 @@ void rtw_free_assoc_resources_locked(struct adapter *adapter) psta =rtw_get_stainfo (&adapter->stapriv, tgt_network->network.MacAddress); -spin_lock_bh (&(pstapriv->sta_hash_lock)); +spin_lock_bh (&pstapriv->sta_hash_lock);rtw_free_stainfo (adapter, psta);spin_unlock_bh (&pstapriv->sta_hash_lock); }
@@ -752,7 +756,7 @@ void rtw_free_assoc_resources_locked(struct adapter *adapter)rtw_free_all_stainfo (adapter); psta =rtw_get_bcmc_stainfo (adapter); -spin_lock_bh (&(pstapriv->sta_hash_lock)); +spin_lock_bh (&pstapriv->sta_hash_lock);rtw_free_stainfo (adapter, psta);spin_unlock_bh (&pstapriv->sta_hash_lock);
@@ -900,8 +904,8 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str/* ptarget_wlan: found from scanned_queue */ static void rtw_joinbss_update_network (struct adapter *padapter,struct wlan_network *ptarget_wlan,struct wlan_network *pnetwork) { -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;DBG_88E ("%s\n" , __func__);
@@ -958,9 +962,9 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf) {struct sta_info *ptarget_sta =NULL , *pcur_sta =NULL ;struct sta_priv *pstapriv = &adapter->stapriv; -struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); +struct mlme_priv *pmlmepriv = &adapter->mlmepriv;struct wlan_network *pnetwork = (struct wlan_network *)pbuf; -struct wlan_network *cur_network = &(pmlmepriv->cur_network); +struct wlan_network *cur_network = &pmlmepriv->cur_network;struct wlan_network *pcur_wlan =NULL , *ptarget_wlan =NULL ;unsigned int the_same_macaddr = false;
@@ -986,7 +990,7 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("\nrtw_joinbss_event_callback!! _enter_critical\n" ));if (pnetwork->join_res >0 ) { -spin_lock_bh (&(pmlmepriv->scanned_queue.lock)); +spin_lock_bh (&pmlmepriv->scanned_queue.lock);if (check_fwstate (pmlmepriv, _FW_UNDER_LINKING)) {/* s1. find ptarget_wlan */ if (check_fwstate (pmlmepriv, _FW_LINKED)) {
@@ -999,7 +1003,7 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf) pcur_sta =rtw_get_stainfo (pstapriv, cur_network->network.MacAddress);if (pcur_sta) { -spin_lock_bh (&(pstapriv->sta_hash_lock)); +spin_lock_bh (&pstapriv->sta_hash_lock);rtw_free_stainfo (adapter, pcur_sta);spin_unlock_bh (&pstapriv->sta_hash_lock); }
@@ -1091,11 +1095,11 @@ static u8 search_max_mac_id(struct adapter *padapter)u8 mac_id;#if defined(CONFIG_88EU_AP_MODE )u8 aid; -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct sta_priv *pstapriv = &padapter->stapriv;#endif -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;#if defined(CONFIG_88EU_AP_MODE )if (check_fwstate (pmlmepriv,WIFI_AP_STATE )) {
@@ -1133,9 +1137,9 @@ void rtw_stassoc_hw_rpt(struct adapter *adapter, struct sta_info *psta)void rtw_stassoc_event_callback (struct adapter *adapter,u8 *pbuf) {struct sta_info *psta; -struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); +struct mlme_priv *pmlmepriv = &adapter->mlmepriv;struct stassoc_event *pstassoc = (struct stassoc_event *)pbuf; -struct wlan_network *cur_network = &(pmlmepriv->cur_network); +struct wlan_network *cur_network = &pmlmepriv->cur_network;struct wlan_network *ptarget_wlan =NULL ;if (!rtw_access_ctrl (adapter, pstassoc->macaddr))
@@ -1177,7 +1181,7 @@ void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf)if ((check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE )) || (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ))) {if (adapter->stapriv.asoc_sta_count ==2 ) { -spin_lock_bh (&(pmlmepriv->scanned_queue.lock)); +spin_lock_bh (&pmlmepriv->scanned_queue.lock); ptarget_wlan =rtw_find_network (&pmlmepriv->scanned_queue, cur_network->network.MacAddress);if (ptarget_wlan) ptarget_wlan->fixed = true;
@@ -1197,10 +1201,10 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)struct wlan_network *pwlan =NULL ;struct wlan_bssid_ex *pdev_network =NULL ;u8 *pibss =NULL ; -struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); +struct mlme_priv *pmlmepriv = &adapter->mlmepriv;struct stadel_event *pstadel = (struct stadel_event *)pbuf;struct sta_priv *pstapriv = &adapter->stapriv; -struct wlan_network *tgt_network = &(pmlmepriv->cur_network); +struct wlan_network *tgt_network = &pmlmepriv->cur_network; psta =rtw_get_stainfo (&adapter->stapriv, pstadel->macaddr);if (psta)
@@ -1238,7 +1242,7 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)rtw_free_assoc_resources (adapter);rtw_indicate_disconnect (adapter); -spin_lock_bh (&(pmlmepriv->scanned_queue.lock)); +spin_lock_bh (&pmlmepriv->scanned_queue.lock);/* remove the network entry in scanned_queue */ pwlan =rtw_find_network (&pmlmepriv->scanned_queue, tgt_network->network.MacAddress);if (pwlan) {
@@ -1250,12 +1254,12 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf) }if (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) ||check_fwstate (pmlmepriv,WIFI_ADHOC_STATE )) { -spin_lock_bh (&(pstapriv->sta_hash_lock)); +spin_lock_bh (&pstapriv->sta_hash_lock);rtw_free_stainfo (adapter, psta);spin_unlock_bh (&pstapriv->sta_hash_lock);if (adapter->stapriv.asoc_sta_count ==1 ) {/* a sta + bc/mc_stainfo (not Ibss_stainfo) */ -spin_lock_bh (&(pmlmepriv->scanned_queue.lock)); +spin_lock_bh (&pmlmepriv->scanned_queue.lock);/* free old ibss network */ pwlan =rtw_find_network (&pmlmepriv->scanned_queue, tgt_network->network.MacAddress);if (pwlan) {
@@ -1264,7 +1268,7 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf) }spin_unlock_bh (&pmlmepriv->scanned_queue.lock);/* re-create ibss */ - pdev_network = &(adapter->registrypriv.dev_network); + pdev_network = &adapter->registrypriv.dev_network; pibss = adapter->registrypriv.dev_network.MacAddress;memcpy (pdev_network, &tgt_network->network,get_wlan_bssid_ex_sz (&tgt_network->network));
@@ -1458,12 +1462,12 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv)int ret;struct list_head *phead;struct adapter *adapter; -struct __queue *queue = &(pmlmepriv->scanned_queue); +struct __queue *queue = &pmlmepriv->scanned_queue;struct wlan_network *pnetwork =NULL ;struct wlan_network *candidate =NULL ;u8 supp_ant_div = false; -spin_lock_bh (&(pmlmepriv->scanned_queue.lock)); +spin_lock_bh (&pmlmepriv->scanned_queue.lock); phead =get_list_head (queue); adapter = (struct adapter *)pmlmepriv->nic_hdl; pmlmepriv->pscanned = phead->next;
@@ -1518,7 +1522,7 @@ int rtw_set_auth(struct adapter *adapter, struct security_priv *psecuritypriv) {struct cmd_obj *pcmd;struct setauth_parm *psetauthparm; -struct cmd_priv *pcmdpriv = &(adapter->cmdpriv); +struct cmd_priv *pcmdpriv = &adapter->cmdpriv;int res = _SUCCESS; pcmd =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );
@@ -1553,8 +1557,8 @@ int rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypriv, inu8 keylen;struct cmd_obj *pcmd;struct setkey_parm *psetkeyparm; -struct cmd_priv *pcmdpriv = &(adapter->cmdpriv); -struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); +struct cmd_priv *pcmdpriv = &adapter->cmdpriv; +struct mlme_priv *pmlmepriv = &adapter->mlmepriv;int res = _SUCCESS; pcmd =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );
@@ -1590,11 +1594,13 @@ int rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypriv, inswitch (psetkeyparm->algorithm) {case _WEP40_: keylen =5 ; -memcpy (&(psetkeyparm->key[0 ]), &(psecuritypriv->dot11DefKey[keyid].skey[0 ]), keylen); +memcpy (&psetkeyparm->key[0 ], + &psecuritypriv->dot11DefKey[keyid].skey[0 ], keylen);break ;case _WEP104_: keylen =13 ; -memcpy (&(psetkeyparm->key[0 ]), &(psecuritypriv->dot11DefKey[keyid].skey[0 ]), keylen); +memcpy (&psetkeyparm->key[0 ], + &psecuritypriv->dot11DefKey[keyid].skey[0 ], keylen);break ;case _TKIP_: keylen =16 ;
@@ -1929,7 +1935,7 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len)struct ht_priv *phtpriv = &pmlmepriv->htpriv;struct registry_priv *pregistrypriv = &padapter->registrypriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;if (!phtpriv->ht_option)return ;
Signature · 1 line
2.19.2
PATCH 3/9 staging: rtl8188eu: use __func__ in rtw_mlme.c
In reply to Michael StraubeUse __func__ instead of hardcoded function names.
Reported by checkpatch.
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/rtl8188eu/core/rtw_mlme.c | 48 +++++++++++++---------- 1 file changed, 28 insertions(+), 20 deletions(-)
drivers/staging/rtl8188eu/core/rtw_mlme.c +28 -20
@@ -230,8 +230,9 @@ int rtw_if_up(struct adapter *padapter)if (padapter->bDriverStopped || padapter->bSurpriseRemoved || !check_fwstate (&padapter->mlmepriv, _FW_LINKED)) {RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, - ("rtw_if_up:bDriverStopped(%d) OR bSurpriseRemoved(%d)" , - padapter->bDriverStopped, padapter->bSurpriseRemoved)); + ("%s:bDriverStopped(%d) OR bSurpriseRemoved(%d)" , + __func__, padapter->bDriverStopped, + padapter->bSurpriseRemoved)); res = false; }else { res = true;
@@ -555,11 +556,13 @@ void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf) pnetwork = (struct wlan_bssid_ex *)pbuf; -RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("rtw_survey_event_callback, ssid=%s\n" , pnetwork->Ssid.Ssid)); +RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, + ("%s, ssid=%s\n" , __func__, pnetwork->Ssid.Ssid)); len =get_wlan_bssid_ex_sz (pnetwork);if (len > (sizeof (struct wlan_bssid_ex ))) { -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("\n****rtw_survey_event_callback: return a wrong bss ***\n" )); +RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, + ("\n****%s: return a wrong bss ***\n" , __func__));return ; }spin_lock_bh (&pmlmepriv->lock);
@@ -606,7 +609,8 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf) pmlmepriv->wps_probe_req_ie =NULL ; } -RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("rtw_surveydone_event_callback: fw_state:%x\n\n" ,get_fwstate (pmlmepriv))); +RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, + ("%s: fw_state:%x\n\n" , __func__,get_fwstate (pmlmepriv)));if (check_fwstate (pmlmepriv, _FW_UNDER_SURVEY)) {del_timer_sync (&pmlmepriv->scan_to_timer);
@@ -695,7 +699,7 @@ static void free_scanqueue(struct mlme_priv *pmlmepriv)struct __queue *scan_queue = &pmlmepriv->scanned_queue;struct list_head *plist, *phead, *ptemp; -RT_TRACE (_module_rtl871x_mlme_c_, _drv_notice_, ("+free_scanqueue\n" )); +RT_TRACE (_module_rtl871x_mlme_c_, _drv_notice_, ("+%s\n" , __func__));spin_lock_bh (&scan_queue->lock);spin_lock_bh (&free_queue->lock);
@@ -808,7 +812,7 @@ void rtw_indicate_disconnect(struct adapter *padapter) {struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("+rtw_indicate_disconnect\n" )); +RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("+%s\n" , __func__));_clr_fwstate_ (pmlmepriv, _FW_UNDER_LINKING |WIFI_UNDER_WPS );
@@ -1159,12 +1163,15 @@ void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf) psta =rtw_get_stainfo (&adapter->stapriv, pstassoc->macaddr);if (psta) {/* the sta have been in sta_info_queue => do nothing */ -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("Error: rtw_stassoc_event_callback: sta has been in sta_hash_queue\n" )); +RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, + ("Error: %s: sta has been in sta_hash_queue\n" , + __func__));return ;/* between drv has received this event before and fw have not yet to set key to CAM_ENTRY) */ } psta =rtw_alloc_stainfo (&adapter->stapriv, pstassoc->macaddr);if (!psta) { -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("Can't alloc sta_info when rtw_stassoc_event_callback\n" )); +RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, + ("Can't alloc sta_info when %s\n" , __func__));return ; }/* to do: init sta_info variable */
@@ -1293,7 +1300,7 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)void rtw_cpwm_event_callback (struct adapter *padapter,u8 *pbuf) { -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("+rtw_cpwm_event_callback !!!\n" )); +RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("+%s !!!\n" , __func__)); }/*
@@ -1574,22 +1581,23 @@ int rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypriv, inif (psecuritypriv->dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) { psetkeyparm->algorithm = (unsigned char )psecuritypriv->dot118021XGrpPrivacy;RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, - ("\n rtw_set_key: psetkeyparm->algorithm=(unsigned char)psecuritypriv->dot118021XGrpPrivacy=%d\n" , - psetkeyparm->algorithm)); + ("\n %s: psetkeyparm->algorithm=(unsigned char)psecuritypriv->dot118021XGrpPrivacy=%d\n" , + __func__, psetkeyparm->algorithm)); }else { psetkeyparm->algorithm = (u8 )psecuritypriv->dot11PrivacyAlgrthm;RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, - ("\n rtw_set_key: psetkeyparm->algorithm=(u8)psecuritypriv->dot11PrivacyAlgrthm=%d\n" , - psetkeyparm->algorithm)); + ("\n %s: psetkeyparm->algorithm=(u8)psecuritypriv->dot11PrivacyAlgrthm=%d\n" , + __func__, psetkeyparm->algorithm)); } psetkeyparm->keyid = (u8 )keyid;/* 0~3 */ psetkeyparm->set_tx = set_tx; pmlmepriv->key_mask |=BIT (psetkeyparm->keyid); -DBG_88E ("==> rtw_set_key algorithm(%x), keyid(%x), key_mask(%x)\n" , - psetkeyparm->algorithm, psetkeyparm->keyid, pmlmepriv->key_mask); +DBG_88E ("==> %s algorithm(%x), keyid(%x), key_mask(%x)\n" , + __func__, psetkeyparm->algorithm, psetkeyparm->keyid, + pmlmepriv->key_mask);RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, - ("\n rtw_set_key: psetkeyparm->algorithm=%d psetkeyparm->keyid=(u8)keyid=%d\n" , - psetkeyparm->algorithm, keyid)); + ("\n %s: psetkeyparm->algorithm=%d psetkeyparm->keyid=(u8)keyid=%d\n" , + __func__, psetkeyparm->algorithm, keyid));switch (psetkeyparm->algorithm) {case _WEP40_:
@@ -1614,8 +1622,8 @@ int rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypriv, inbreak ;default :RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, - ("\n rtw_set_key:psecuritypriv->dot11PrivacyAlgrthm=%x (must be 1 or 2 or 4 or 5)\n" , - psecuritypriv->dot11PrivacyAlgrthm)); + ("\n %s:psecuritypriv->dot11PrivacyAlgrthm=%x (must be 1 or 2 or 4 or 5)\n" , + __func__, psecuritypriv->dot11PrivacyAlgrthm)); res = _FAIL; goto err_free_parm; }
Signature · 1 line
2.19.2
PATCH 4/9 staging: rtl8188eu: remove rtw_android_set_block()
In reply to Michael StraubeThe function rtw_android_set_block() just returns zero. The only user is the function rtw_android_priv_cmd(). The variable bytes_written is initialized to zero and not changed before the use of rtw_android_set_block(). Remove rtw_android_set_block() and it's only use.
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/rtl8188eu/os_dep/rtw_android.c | 8 -------- 1 file changed, 8 deletions(-)
drivers/staging/rtl8188eu/os_dep/rtw_android.c +0 -8
@@ -127,12 +127,6 @@ static int android_get_p2p_addr(struct net_device *net, char *command,return ETH_ALEN ; } -static int rtw_android_set_block (struct net_device *net,char *command, -int total_len) -{ -return 0 ; -} -int rtw_android_priv_cmd (struct net_device *net,struct ifreq *ifr,int cmd) {int ret =0 ;
@@ -186,8 +180,6 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd) priv_cmd.total_len);break ;case ANDROID_WIFI_CMD_BLOCK : - bytes_written =rtw_android_set_block (net, command, - priv_cmd.total_len);break ;case ANDROID_WIFI_CMD_RXFILTER_START :break ;
Signature · 1 line
2.19.2
PATCH 5/9 staging: rtl8188eu: cleanup declarations in rtw_mlme.c
In reply to Michael StraubeReplace tabs with spaces, remove spaces, remove blank lines and break lines appropriatly in declarations.
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/rtl8188eu/core/rtw_mlme.c | 130 +++++++++++----------- 1 file changed, 64 insertions(+), 66 deletions(-)
drivers/staging/rtl8188eu/core/rtw_mlme.c +64 -66
@@ -24,11 +24,11 @@ extern const u8 MCS_rate_1R[16];int rtw_init_mlme_priv (struct adapter *padapter) { -int i; -u8 *pbuf; -struct wlan_network *pnetwork; -struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -int res = _SUCCESS; +int i; +u8 *pbuf; +struct wlan_network *pnetwork; +struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +int res = _SUCCESS;/* We don't need to memset padapter->XXX to zero, because adapter is allocated by vzalloc(). */
@@ -179,7 +179,7 @@ void _rtw_free_network_nolock(struct mlme_priv *pmlmepriv, struct wlan_network *struct wlan_network *rtw_find_network (struct __queue *scanned_queue,u8 *addr) {struct list_head *phead, *plist; -struct wlan_network *pnetwork =NULL ; +struct wlan_network *pnetwork =NULL ;u8 zero_addr[ETH_ALEN ] = {0 ,0 ,0 ,0 ,0 ,0 };if (!memcmp (zero_addr, addr,ETH_ALEN )) {
@@ -259,7 +259,7 @@ u8 *rtw_get_capability_from_ie(u8 *ie)u16 rtw_get_capability (struct wlan_bssid_ex *bss) { -__le16 val; +__le16 val;memcpy ((u8 *)&val,rtw_get_capability_from_ie (bss->ies),2 );
@@ -327,8 +327,8 @@ int is_same_network(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst)struct wlan_network *rtw_get_oldest_wlan_network (struct __queue *scanned_queue) {struct list_head *plist, *phead; -struct wlan_network *pwlan =NULL ; -struct wlan_network *oldest =NULL ; +struct wlan_network *pwlan =NULL ; +struct wlan_network *oldest =NULL ; phead =get_list_head (scanned_queue);
@@ -402,11 +402,11 @@ static void update_current_network(struct adapter *adapter, struct wlan_bssid_exvoid rtw_update_scanned_network (struct adapter *adapter,struct wlan_bssid_ex *target) {struct list_head *plist, *phead; -u32 bssid_ex_sz; +u32 bssid_ex_sz;struct mlme_priv *pmlmepriv = &adapter->mlmepriv;struct __queue *queue = &pmlmepriv->scanned_queue; -struct wlan_network *pnetwork =NULL ; -struct wlan_network *oldest =NULL ; +struct wlan_network *pnetwork =NULL ; +struct wlan_network *oldest =NULL ;spin_lock_bh (&queue->lock); phead =get_list_head (queue);
@@ -722,7 +722,7 @@ static void free_scanqueue(struct mlme_priv *pmlmepriv)*/ void rtw_free_assoc_resources (struct adapter *adapter) { -struct mlme_priv *pmlmepriv = &adapter->mlmepriv; +struct mlme_priv *pmlmepriv = &adapter->mlmepriv;spin_lock_bh (&pmlmepriv->scanned_queue.lock);rtw_free_assoc_resources_locked (adapter);
@@ -735,8 +735,8 @@ void rtw_free_assoc_resources(struct adapter *adapter)void rtw_free_assoc_resources_locked (struct adapter *adapter) {struct wlan_network *pwlan =NULL ; -struct mlme_priv *pmlmepriv = &adapter->mlmepriv; -struct sta_priv *pstapriv = &adapter->stapriv; +struct mlme_priv *pmlmepriv = &adapter->mlmepriv; +struct sta_priv *pstapriv = &adapter->stapriv;struct wlan_network *tgt_network = &pmlmepriv->cur_network;RT_TRACE (_module_rtl871x_mlme_c_, _drv_notice_, ("+rtw_free_assoc_resources\n" ));
@@ -784,7 +784,7 @@ void rtw_free_assoc_resources_locked(struct adapter *adapter)*/ void rtw_indicate_connect (struct adapter *padapter) { -struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("+%s\n" , __func__));
@@ -810,7 +810,7 @@ void rtw_indicate_connect(struct adapter *padapter)*/ void rtw_indicate_disconnect (struct adapter *padapter) { -struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("+%s\n" , __func__));
@@ -965,12 +965,12 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_netvoid rtw_joinbss_event_prehandle (struct adapter *adapter,u8 *pbuf) {struct sta_info *ptarget_sta =NULL , *pcur_sta =NULL ; -struct sta_priv *pstapriv = &adapter->stapriv; +struct sta_priv *pstapriv = &adapter->stapriv;struct mlme_priv *pmlmepriv = &adapter->mlmepriv; -struct wlan_network *pnetwork = (struct wlan_network *)pbuf; +struct wlan_network *pnetwork = (struct wlan_network *)pbuf;struct wlan_network *cur_network = &pmlmepriv->cur_network; -struct wlan_network *pcur_wlan =NULL , *ptarget_wlan =NULL ; -unsigned int the_same_macaddr = false; +struct wlan_network *pcur_wlan =NULL , *ptarget_wlan =NULL ; +unsigned int the_same_macaddr = false;RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("joinbss event call back received with res=%d\n" , pnetwork->join_res));
@@ -1087,7 +1087,7 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)void rtw_joinbss_event_callback (struct adapter *adapter,u8 *pbuf) { -struct wlan_network *pnetwork = (struct wlan_network *)pbuf; +struct wlan_network *pnetwork = (struct wlan_network *)pbuf;mlmeext_joinbss_event_callback (adapter, pnetwork->join_res);
@@ -1142,9 +1142,9 @@ void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf) {struct sta_info *psta;struct mlme_priv *pmlmepriv = &adapter->mlmepriv; -struct stassoc_event *pstassoc = (struct stassoc_event *)pbuf; +struct stassoc_event *pstassoc = (struct stassoc_event *)pbuf;struct wlan_network *cur_network = &pmlmepriv->cur_network; -struct wlan_network *ptarget_wlan =NULL ; +struct wlan_network *ptarget_wlan =NULL ;if (!rtw_access_ctrl (adapter, pstassoc->macaddr))return ;
@@ -1209,8 +1209,8 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)struct wlan_bssid_ex *pdev_network =NULL ;u8 *pibss =NULL ;struct mlme_priv *pmlmepriv = &adapter->mlmepriv; -struct stadel_event *pstadel = (struct stadel_event *)pbuf; -struct sta_priv *pstapriv = &adapter->stapriv; +struct stadel_event *pstadel = (struct stadel_event *)pbuf; +struct sta_priv *pstapriv = &adapter->stapriv;struct wlan_network *tgt_network = &pmlmepriv->cur_network; psta =rtw_get_stainfo (&adapter->stapriv, pstadel->macaddr);
@@ -1309,9 +1309,8 @@ void rtw_cpwm_event_callback(struct adapter *padapter, u8 *pbuf)*/ void _rtw_join_timeout_handler (struct timer_list *t) { -struct adapter *adapter = -from_timer (adapter, t, mlmepriv.assoc_timer); -struct mlme_priv *pmlmepriv = &adapter->mlmepriv; +struct adapter *adapter =from_timer (adapter, t, mlmepriv.assoc_timer); +struct mlme_priv *pmlmepriv = &adapter->mlmepriv;int do_join_r;DBG_88E ("%s, fw_state=%x\n" , __func__,get_fwstate (pmlmepriv));
@@ -1351,9 +1350,9 @@ void _rtw_join_timeout_handler (struct timer_list *t)*/ void rtw_scan_timeout_handler (struct timer_list *t) { -struct adapter *adapter = -from_timer (adapter, t, mlmepriv.scan_to_timer); -struct mlme_priv *pmlmepriv = &adapter->mlmepriv; +struct adapter *adapter =from_timer (adapter, t, + mlmepriv.scan_to_timer); +struct mlme_priv *pmlmepriv = &adapter->mlmepriv;DBG_88E (FUNC_ADPT_FMT " fw_state=%x\n" ,FUNC_ADPT_ARG (adapter),get_fwstate (pmlmepriv));spin_lock_bh (&pmlmepriv->lock);
@@ -1379,8 +1378,8 @@ static void rtw_auto_scan_handler(struct adapter *padapter)void rtw_dynamic_check_timer_handlder (struct timer_list *t) { -struct adapter *adapter = -from_timer (adapter, t, mlmepriv.dynamic_chk_timer); +struct adapter *adapter =from_timer (adapter, t, + mlmepriv.dynamic_chk_timer);struct registry_priv *pregistrypriv = &adapter->registrypriv;if (!adapter)
@@ -1414,7 +1413,8 @@ static int rtw_check_join_candidate(struct mlme_priv *pmlmepriv {int updated = false;unsigned long since_scan; - struct adapter *adapter = container_of(pmlmepriv, struct adapter, mlmepriv); + struct adapter *adapter = container_of(pmlmepriv, struct adapter, + mlmepriv);/* check bssid, if needed */ if (pmlmepriv->assoc_by_bssid) {
@@ -1470,9 +1470,9 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv)struct list_head *phead;struct adapter *adapter;struct __queue *queue = &pmlmepriv->scanned_queue; -struct wlan_network *pnetwork =NULL ; -struct wlan_network *candidate =NULL ; -u8 supp_ant_div = false; +struct wlan_network *pnetwork =NULL ; +struct wlan_network *candidate =NULL ; +u8 supp_ant_div = false;spin_lock_bh (&pmlmepriv->scanned_queue.lock); phead =get_list_head (queue);
@@ -1527,10 +1527,10 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv)int rtw_set_auth (struct adapter *adapter,struct security_priv *psecuritypriv) { -struct cmd_obj *pcmd; -struct setauth_parm *psetauthparm; +struct cmd_obj *pcmd; +struct setauth_parm *psetauthparm;struct cmd_priv *pcmdpriv = &adapter->cmdpriv; -int res = _SUCCESS; +int res = _SUCCESS; pcmd =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );if (!pcmd) {
@@ -1561,12 +1561,12 @@ int rtw_set_auth(struct adapter *adapter, struct security_priv *psecuritypriv)int rtw_set_key (struct adapter *adapter,struct security_priv *psecuritypriv,int keyid,u8 set_tx) { -u8 keylen; -struct cmd_obj *pcmd; -struct setkey_parm *psetkeyparm; +u8 keylen; +struct cmd_obj *pcmd; +struct setkey_parm *psetkeyparm;struct cmd_priv *pcmdpriv = &adapter->cmdpriv;struct mlme_priv *pmlmepriv = &adapter->mlmepriv; -int res = _SUCCESS; +int res = _SUCCESS; pcmd =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );if (!pcmd)
@@ -1646,7 +1646,7 @@ int rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypriv, in/* adjust ies for rtw_joinbss_cmd in WMM */ int rtw_restruct_wmm_ie (struct adapter *adapter,u8 *in_ie,u8 *out_ie,uint in_len,uint initial_out_len) { -unsigned int ielength =0 ; +unsigned int ielength =0 ;unsigned int i, j;/* i = 12; after the fixed IE */
@@ -1725,12 +1725,11 @@ static int rtw_append_pmkid(struct adapter *Adapter, int iEntry, u8 *ie, uint ieint rtw_restruct_sec_ie (struct adapter *adapter,u8 *in_ie,u8 *out_ie,uint in_len) {u8 authmode; -uint ielength; +uint ielength;int iEntry; -struct mlme_priv *pmlmepriv = &adapter->mlmepriv;struct security_priv *psecuritypriv = &adapter->securitypriv; -uint ndisauthmode = psecuritypriv->ndisauthtype; +uint ndisauthmode = psecuritypriv->ndisauthtype;uint ndissecuritytype = psecuritypriv->ndisencryptstatus; RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_,
@@ -1772,7 +1771,7 @@ void rtw_init_registrypriv_dev_network(struct adapter *adapter) {struct registry_priv *pregistrypriv = &adapter->registrypriv;struct eeprom_priv *peepriv = &adapter->eeprompriv; -struct wlan_bssid_ex *pdev_network = &pregistrypriv->dev_network; +struct wlan_bssid_ex *pdev_network = &pregistrypriv->dev_network;u8 *myhwaddr =myid (peepriv);memcpy (pdev_network->MacAddress, myhwaddr,ETH_ALEN );
@@ -1791,9 +1790,9 @@ void rtw_update_registrypriv_dev_network(struct adapter *adapter) {int sz =0 ;struct registry_priv *pregistrypriv = &adapter->registrypriv; -struct wlan_bssid_ex *pdev_network = &pregistrypriv->dev_network; -struct security_priv *psecuritypriv = &adapter->securitypriv; -struct wlan_network *cur_network = &adapter->mlmepriv.cur_network; +struct wlan_bssid_ex *pdev_network = &pregistrypriv->dev_network; +struct security_priv *psecuritypriv = &adapter->securitypriv; +struct wlan_network *cur_network = &adapter->mlmepriv.cur_network; pdev_network->Privacy = psecuritypriv->dot11PrivacyAlgrthm >0 ?1 :0 ;/* adhoc no 802.1x */
@@ -1843,9 +1842,9 @@ void rtw_get_encrypt_decrypt_from_registrypriv(struct adapter *adapter)/* the function is at passive_level */ void rtw_joinbss_reset (struct adapter *padapter) { -u8 threshold; -struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct ht_priv *phtpriv = &pmlmepriv->htpriv; +u8 threshold; +struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +struct ht_priv *phtpriv = &pmlmepriv->htpriv;/* todo: if you want to do something io/reg/hw setting before join_bss, please add code here */ pmlmepriv->num_FortyMHzIntolerant =0 ;
@@ -1875,9 +1874,9 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_enum ht_cap_ampdu_factor max_rx_ampdu_factor;unsigned char *p;unsigned char WMM_IE [] = {0x00 ,0x50 ,0xf2 ,0x02 ,0x00 ,0x01 ,0x00 }; -struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct qos_priv *pqospriv = &pmlmepriv->qospriv; -struct ht_priv *phtpriv = &pmlmepriv->htpriv; +struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +struct qos_priv *pqospriv = &pmlmepriv->qospriv; +struct ht_priv *phtpriv = &pmlmepriv->htpriv;u32 rx_packet_offset, max_recvbuf_sz; phtpriv->ht_option = false;
@@ -1939,10 +1938,10 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_/* the function is > passive_level (in critical_section) */ void rtw_update_ht_cap (struct adapter *padapter,u8 *pie,uint ie_len) { -struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct ht_priv *phtpriv = &pmlmepriv->htpriv; +struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +struct ht_priv *phtpriv = &pmlmepriv->htpriv;struct registry_priv *pregistrypriv = &padapter->registrypriv; -struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;if (!phtpriv->ht_option)
@@ -2001,7 +2000,7 @@ void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitfru8 issued;int priority;struct sta_info *psta =NULL ; -struct ht_priv *phtpriv; +struct ht_priv *phtpriv;struct pkt_attrib *pattrib = &pxmitframe->attrib; if (is_multicast_ether_addr(pattrib->ra) ||
@@ -2034,7 +2033,7 @@ void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitfrvoid rtw_roaming (struct adapter *padapter,struct wlan_network *tgt_network) { -struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;spin_lock_bh (&pmlmepriv->lock);_rtw_roaming (padapter, tgt_network);
@@ -2043,9 +2042,8 @@ void rtw_roaming(struct adapter *padapter, struct wlan_network *tgt_network)void _rtw_roaming (struct adapter *padapter,struct wlan_network *tgt_network) { -struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;int do_join_r; -struct wlan_network *pnetwork;if (tgt_network)
Signature · 1 line
2.19.2
PATCH 6/9 staging: rtl8188eu: refactor if else statement
In reply to Michael StraubeRefactor if else statement to clear checkpatch warnings.
WARNING: else is not generally useful after a break or return
WARNING: line over 80 characters
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/rtl8188eu/core/rtw_mlme.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/staging/rtl8188eu/core/rtw_mlme.c +3 -6
@@ -1758,12 +1758,9 @@ int rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_ } iEntry =SecIsInPMKIDList (adapter, pmlmepriv->assoc_bssid); -if (iEntry <0 ) { -return ielength; - }else { -if (authmode == _WPA2_IE_ID_) - ielength =rtw_append_pmkid (adapter, iEntry, out_ie, ielength); - } +if (iEntry >=0 && authmode == _WPA2_IE_ID_) + ielength =rtw_append_pmkid (adapter, iEntry, out_ie, ielength); +return ielength; }
Signature · 1 line
2.19.2
PATCH 7/9 staging: rtl8188eu: remove return from void function
In reply to Michael StraubeRemove return from a void function to clear a checkpatch warning.
WARNING: void function return statements are not generally useful
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/rtl8188eu/core/rtw_mlme.c | 2 -- 1 file changed, 2 deletions(-)
drivers/staging/rtl8188eu/core/rtw_mlme.c +0 -2
@@ -592,9 +592,7 @@ void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf) } exit: -spin_unlock_bh (&pmlmepriv->lock); -return ; }void rtw_surveydone_event_callback (struct adapter *adapter,u8 *pbuf)
Signature · 1 line
2.19.2
PATCH 8/9 staging: rtl8188eu: correct indentation
In reply to Michael StraubeCorrect indentation to clear a checkpatch warning.
WARNING: suspect code indent for conditional statements (8, 24)
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/rtl8188eu/core/rtw_mlme.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8188eu/core/rtw_mlme.c +1 -1
@@ -1739,7 +1739,7 @@ int rtw_restruct_sec_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_ ielength =12 ;if ((ndisauthmode == Ndis802_11AuthModeWPA) || (ndisauthmode == Ndis802_11AuthModeWPAPSK)) - authmode = _WPA_IE_ID_; + authmode = _WPA_IE_ID_;if ((ndisauthmode == Ndis802_11AuthModeWPA2) || (ndisauthmode == Ndis802_11AuthModeWPA2PSK)) authmode = _WPA2_IE_ID_;
Signature · 1 line
2.19.2
PATCH 9/9 staging: rtl8188eu: cleanup lines over 80 characters
In reply to Michael StraubeCleanup lines over 80 characters by replacing tabs with spaces or adding appropriate line breaks.
Signed-off-by Michael Straube <[email protected]>
--- drivers/staging/rtl8188eu/core/rtw_mlme.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
drivers/staging/rtl8188eu/core/rtw_mlme.c +7 -6
@@ -324,7 +324,7 @@ int is_same_network(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst) (d_cap & WLAN_CAPABILITY_ESS))); } -struct wlan_network *rtw_get_oldest_wlan_network (struct __queue *scanned_queue) +struct wlan_network *rtw_get_oldest_wlan_network (struct __queue *scanned_queue) {struct list_head *plist, *phead;struct wlan_network *pwlan =NULL ;
@@ -413,7 +413,7 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t plist = phead->next;while (phead != plist) { - pnetwork = container_of(plist, struct wlan_network, list); + pnetwork = container_of(plist, struct wlan_network, list);if (is_same_network (&pnetwork->network, target))break ;
@@ -451,7 +451,8 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t pnetwork =rtw_alloc_network (pmlmepriv);/* will update scan_time */ if (!pnetwork) { -RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, ("\n\n\nsomething wrong here\n\n\n" )); +RT_TRACE (_module_rtl871x_mlme_c_, _drv_err_, + ("\n\n\nsomething wrong here\n\n\n" )); goto exit; }
@@ -469,9 +470,9 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *tlist_add_tail (&pnetwork->list, &queue->queue); } }else { -/* we have an entry and we are going to update it. But this entry may -* be already expired. In this case we do the same as we found a new -* net and call the new_net handler +/* we have an entry and we are going to update it. But this +* entry may be already expired. In this case we do the same +* as we found a new net and call the new_net handler */ bool update_ie = true;
Signature · 1 line
2.19.2