diff options
Diffstat (limited to 'drivers/staging/rtl8723bs/core')
| -rw-r--r-- | drivers/staging/rtl8723bs/core/rtw_ap.c | 12 | ||||
| -rw-r--r-- | drivers/staging/rtl8723bs/core/rtw_cmd.c | 51 | ||||
| -rw-r--r-- | drivers/staging/rtl8723bs/core/rtw_debug.c | 11 | ||||
| -rw-r--r-- | drivers/staging/rtl8723bs/core/rtw_efuse.c | 33 | ||||
| -rw-r--r-- | drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 6 | ||||
| -rw-r--r-- | drivers/staging/rtl8723bs/core/rtw_io.c | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8723bs/core/rtw_mlme.c | 79 | ||||
| -rw-r--r-- | drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 59 | ||||
| -rw-r--r-- | drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 18 | ||||
| -rw-r--r-- | drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8723bs/core/rtw_xmit.c | 2 |
12 files changed, 83 insertions, 194 deletions
diff --git a/drivers/staging/rtl8723bs/core/rtw_ap.c b/drivers/staging/rtl8723bs/core/rtw_ap.c index cbbfef389874..bc0230672457 100644 --- a/drivers/staging/rtl8723bs/core/rtw_ap.c +++ b/drivers/staging/rtl8723bs/core/rtw_ap.c @@ -782,12 +782,8 @@ void start_bss_network(struct adapter *padapter, u8 *pbuf) /* check if there is wps ie, */ /* if there is wpsie in beacon, the hostapd will update beacon twice when stating hostapd, */ /* and at first time the security ie (RSN/WPA IE) will not include in beacon. */ - if (NULL == rtw_get_wps_ie( - pnetwork->IEs+_FIXED_IE_LENGTH_, - pnetwork->IELength-_FIXED_IE_LENGTH_, - NULL, - NULL - )) + if (!rtw_get_wps_ie(pnetwork->IEs+_FIXED_IE_LENGTH_, + pnetwork->IELength-_FIXED_IE_LENGTH_, NULL, NULL)) pmlmeext->bstart_bss = true; /* todo: update wmm, ht cap */ @@ -2340,8 +2336,8 @@ void rtw_ap_restore_network(struct adapter *padapter) Update_RA_Entry(padapter, psta); /* pairwise key */ /* per sta pairwise key and settings */ - if ((padapter->securitypriv.dot11PrivacyAlgrthm == _TKIP_) || - (padapter->securitypriv.dot11PrivacyAlgrthm == _AES_)) { + if ((psecuritypriv->dot11PrivacyAlgrthm == _TKIP_) || + (psecuritypriv->dot11PrivacyAlgrthm == _AES_)) { rtw_setstakey_cmd(padapter, psta, true, false); } } diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl8723bs/core/rtw_cmd.c index 91520ca3bbad..ecaa769f12e6 100644 --- a/drivers/staging/rtl8723bs/core/rtw_cmd.c +++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c @@ -162,9 +162,9 @@ Caller and the rtw_cmd_thread can protect cmd_q by spin_lock. No irqsave is necessary. */ -sint _rtw_init_cmd_priv(struct cmd_priv *pcmdpriv) +int rtw_init_cmd_priv(struct cmd_priv *pcmdpriv) { - sint res = _SUCCESS; + int res = 0; init_completion(&pcmdpriv->cmd_queue_comp); init_completion(&pcmdpriv->terminate_cmdthread_comp); @@ -177,8 +177,8 @@ sint _rtw_init_cmd_priv(struct cmd_priv *pcmdpriv) pcmdpriv->cmd_allocated_buf = rtw_zmalloc(MAX_CMDSZ + CMDBUFF_ALIGN_SZ); - if (pcmdpriv->cmd_allocated_buf == NULL) { - res = _FAIL; + if (!pcmdpriv->cmd_allocated_buf) { + res = -ENOMEM; goto exit; } @@ -186,8 +186,8 @@ sint _rtw_init_cmd_priv(struct cmd_priv *pcmdpriv) pcmdpriv->rsp_allocated_buf = rtw_zmalloc(MAX_RSPSZ + 4); - if (pcmdpriv->rsp_allocated_buf == NULL) { - res = _FAIL; + if (!pcmdpriv->rsp_allocated_buf) { + res = -ENOMEM; goto exit; } @@ -201,10 +201,8 @@ exit: } static void c2h_wk_callback(_workitem *work); -sint _rtw_init_evt_priv(struct evt_priv *pevtpriv) +int rtw_init_evt_priv(struct evt_priv *pevtpriv) { - sint res = _SUCCESS; - /* allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf */ atomic_set(&pevtpriv->event_seq, 0); pevtpriv->evt_done_cnt = 0; @@ -212,8 +210,10 @@ sint _rtw_init_evt_priv(struct evt_priv *pevtpriv) _init_workitem(&pevtpriv->c2h_wk, c2h_wk_callback, NULL); pevtpriv->c2h_wk_alive = false; pevtpriv->c2h_queue = rtw_cbuf_alloc(C2H_QUEUE_MAX_LEN+1); + if (!pevtpriv->c2h_queue) + return -ENOMEM; - return res; + return 0; } void _rtw_free_evt_priv(struct evt_priv *pevtpriv) @@ -256,7 +256,7 @@ ISR/Call-Back functions can't call this sub-function. */ -sint _rtw_enqueue_cmd(struct __queue *queue, struct cmd_obj *obj) +int _rtw_enqueue_cmd(struct __queue *queue, struct cmd_obj *obj) { _irqL irqL; @@ -295,22 +295,6 @@ struct cmd_obj *_rtw_dequeue_cmd(struct __queue *queue) return obj; } -u32 rtw_init_cmd_priv(struct cmd_priv *pcmdpriv) -{ - u32 res; - - res = _rtw_init_cmd_priv(pcmdpriv); - return res; -} - -u32 rtw_init_evt_priv(struct evt_priv *pevtpriv) -{ - int res; - - res = _rtw_init_evt_priv(pevtpriv); - return res; -} - void rtw_free_evt_priv(struct evt_priv *pevtpriv) { RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("rtw_free_evt_priv\n")); @@ -347,7 +331,7 @@ int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj) -u32 rtw_enqueue_cmd(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj) +int rtw_enqueue_cmd(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj) { int res = _FAIL; struct adapter *padapter = pcmdpriv->padapter; @@ -735,12 +719,12 @@ exit: return res; } -u8 rtw_startbss_cmd(struct adapter *padapter, int flags) +int rtw_startbss_cmd(struct adapter *padapter, int flags) { struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; struct submit_ctx sctx; - u8 res = _SUCCESS; + int res = _SUCCESS; if (flags & RTW_CMDF_DIRECTLY) { /* no need to enqueue, do the cmd hdl directly and free cmd parameter */ @@ -2007,11 +1991,6 @@ u8 rtw_drvextra_cmd_hdl(struct adapter *padapter, unsigned char *pbuf) case CHECK_HIQ_WK_CID: rtw_chk_hi_queue_hdl(padapter); break; -#ifdef CONFIG_INTEL_WIDI - case INTEl_WIDI_WK_CID: - intel_widi_wk_hdl(padapter, pdrvextra_cmd->type, pdrvextra_cmd->pbuf); - break; -#endif /* CONFIG_INTEL_WIDI */ /* add for CONFIG_IEEE80211W, none 11w can use it */ case RESET_SECURITYPRIV: reset_securitypriv_hdl(padapter); @@ -2121,7 +2100,7 @@ void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd) rtw_indicate_connect(padapter); } else { - pwlan = _rtw_alloc_network(pmlmepriv); + pwlan = rtw_alloc_network(pmlmepriv); spin_lock_bh(&(pmlmepriv->scanned_queue.lock)); if (pwlan == NULL) { pwlan = rtw_get_oldest_wlan_network(&pmlmepriv->scanned_queue); diff --git a/drivers/staging/rtl8723bs/core/rtw_debug.c b/drivers/staging/rtl8723bs/core/rtw_debug.c index a3c8a712bdc2..9f8446ccf771 100644 --- a/drivers/staging/rtl8723bs/core/rtw_debug.c +++ b/drivers/staging/rtl8723bs/core/rtw_debug.c @@ -1395,16 +1395,16 @@ ssize_t proc_set_btcoex_dbg(struct file *file, const char __user *buffer, size_t } num = sscanf(tmp, "%x %x", module, module+1); - if (1 == num) { - if (0 == module[0]) + if (num == 1) { + if (module[0] == 0) memset(module, 0, sizeof(module)); else memset(module, 0xFF, sizeof(module)); - } else if (2 != num) { + } else if (num != 2) { DBG_871X(FUNC_ADPT_FMT ": input(\"%s\") format incorrect!\n", FUNC_ADPT_ARG(padapter), tmp); - if (0 == num) + if (num == 0) return -EFAULT; } @@ -1425,9 +1425,8 @@ int proc_get_btcoex_info(struct seq_file *m, void *v) padapter = (struct adapter *)rtw_netdev_priv(dev); pbuf = rtw_zmalloc(bufsize); - if (NULL == pbuf) { + if (!pbuf) return -ENOMEM; - } rtw_btcoex_DisplayBtCoexInfo(padapter, pbuf, bufsize); diff --git a/drivers/staging/rtl8723bs/core/rtw_efuse.c b/drivers/staging/rtl8723bs/core/rtw_efuse.c index eea3bece59a1..3b8848182221 100644 --- a/drivers/staging/rtl8723bs/core/rtw_efuse.c +++ b/drivers/staging/rtl8723bs/core/rtw_efuse.c @@ -125,11 +125,8 @@ Efuse_GetCurrentSize( u8 efuseType, bool bPseudoTest) { - u16 ret = 0; - - ret = padapter->HalFunc.EfuseGetCurrentSize(padapter, efuseType, bPseudoTest); - - return ret; + return padapter->HalFunc.EfuseGetCurrentSize(padapter, efuseType, + bPseudoTest); } /* 11/16/2008 MH Add description. Get current efuse area enabled word!!. */ @@ -221,7 +218,6 @@ EFUSE_Read1Byte( struct adapter *Adapter, u16 Address) { - u8 data; u8 Bytetemp = {0x00}; u8 temp = {0x00}; u32 k = 0; @@ -253,8 +249,7 @@ u16 Address) break; } } - data = rtw_read8(Adapter, EFUSE_CTRL); - return data; + return rtw_read8(Adapter, EFUSE_CTRL); } else return 0xFF; @@ -378,11 +373,8 @@ Efuse_PgPacketRead(struct adapter *padapter, u8 *data, bool bPseudoTest) { - int ret = 0; - - ret = padapter->HalFunc.Efuse_PgPacketRead(padapter, offset, data, bPseudoTest); - - return ret; + return padapter->HalFunc.Efuse_PgPacketRead(padapter, offset, data, + bPseudoTest); } int @@ -392,11 +384,8 @@ Efuse_PgPacketWrite(struct adapter *padapter, u8 *data, bool bPseudoTest) { - int ret; - - ret = padapter->HalFunc.Efuse_PgPacketWrite(padapter, offset, word_en, data, bPseudoTest); - - return ret; + return padapter->HalFunc.Efuse_PgPacketWrite(padapter, offset, word_en, + data, bPseudoTest); } /*----------------------------------------------------------------------------- @@ -447,11 +436,9 @@ Efuse_WordEnableDataWrite(struct adapter *padapter, u8 *data, bool bPseudoTest) { - u8 ret = 0; - - ret = padapter->HalFunc.Efuse_WordEnableDataWrite(padapter, efuse_addr, word_en, data, bPseudoTest); - - return ret; + return padapter->HalFunc.Efuse_WordEnableDataWrite(padapter, efuse_addr, + word_en, data, + bPseudoTest); } /*----------------------------------------------------------------------------- diff --git a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c index ac203c01c098..aaf27438cd81 100644 --- a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c +++ b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c @@ -114,7 +114,7 @@ u8 *rtw_set_fixed_ie(unsigned char *pbuf, unsigned int len, unsigned char *sourc { memcpy((void *)pbuf, (void *)source, len); *frlen = *frlen + len; - return (pbuf + len); + return pbuf + len; } /* rtw_set_ie will update frame length */ @@ -136,7 +136,7 @@ u8 *rtw_set_ie *frlen = *frlen + (len + 2); - return (pbuf + len + 2); + return pbuf + len + 2; } /*---------------------------------------------------------------------------- @@ -706,7 +706,7 @@ int rtw_get_sec_ie(u8 *in_ie, uint in_len, u8 *rsn_ie, u16 *rsn_len, u8 *wpa_ie, } } - return (*rsn_len + *wpa_len); + return *rsn_len + *wpa_len; } u8 rtw_is_wps_ie(u8 *ie_ptr, uint *wps_ielen) diff --git a/drivers/staging/rtl8723bs/core/rtw_io.c b/drivers/staging/rtl8723bs/core/rtw_io.c index d341069097e2..a92bc19b196a 100644 --- a/drivers/staging/rtl8723bs/core/rtw_io.c +++ b/drivers/staging/rtl8723bs/core/rtw_io.c @@ -156,7 +156,7 @@ int rtw_init_io_priv(struct adapter *padapter, void (*set_intf_ops)(struct adapt struct io_priv *piopriv = &padapter->iopriv; struct intf_hdl *pintf = &piopriv->intf; - if (set_intf_ops == NULL) + if (!set_intf_ops) return _FAIL; piopriv->padapter = padapter; diff --git a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c b/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c index 0c8a050b2a81..bd75bca1ac6e 100644 --- a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +++ b/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c @@ -44,7 +44,7 @@ u8 rtw_validate_ssid(struct ndis_802_11_ssid *ssid) for (i = 0; i < ssid->SsidLength; i++) { /* wifi, printable ascii code must be supported */ if (!((ssid->Ssid[i] >= 0x20) && (ssid->Ssid[i] <= 0x7e))) { - RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("ssid has nonprintabl ascii\n")); + RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("ssid has non-printable ascii\n")); ret = false; break; } diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c index 406e313477aa..5f78f1eaa7aa 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -13,13 +13,13 @@ extern u8 rtw_do_join(struct adapter *padapter); -sint _rtw_init_mlme_priv(struct adapter *padapter) +int rtw_init_mlme_priv(struct adapter *padapter) { - sint i; + int i; u8 *pbuf; struct wlan_network *pnetwork; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; - sint res = _SUCCESS; + int res = _SUCCESS; pmlmepriv->nic_hdl = (u8 *)padapter; @@ -29,9 +29,9 @@ sint _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); set_scanned_network_val(pmlmepriv, 0); @@ -48,9 +48,9 @@ sint _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++; } @@ -143,7 +143,7 @@ struct wlan_network *_rtw_dequeue_network(struct __queue *queue) } */ -struct wlan_network *_rtw_alloc_network(struct mlme_priv *pmlmepriv)/* _queue *free_queue) */ +struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv) { struct wlan_network *pnetwork; struct __queue *free_queue = &pmlmepriv->free_bss_pool; @@ -161,7 +161,8 @@ struct wlan_network *_rtw_alloc_network(struct mlme_priv *pmlmepriv)/* _queue *f list_del_init(&pnetwork->list); - RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("_rtw_alloc_network: ptr =%p\n", plist)); + RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, + ("rtw_alloc_network: ptr =%p\n", plist)); pnetwork->network_type = 0; pnetwork->fixed = false; pnetwork->last_scanned = jiffies; @@ -332,7 +333,7 @@ void rtw_generate_random_ibss(u8 *pibss) u8 *rtw_get_capability_from_ie(u8 *ie) { - return (ie + 8 + 2); + return ie + 8 + 2; } @@ -347,16 +348,7 @@ u16 rtw_get_capability(struct wlan_bssid_ex *bss) u8 *rtw_get_beacon_interval_from_ie(u8 *ie) { - return (ie + 8); -} - - -int rtw_init_mlme_priv(struct adapter *padapter)/* struct mlme_priv *pmlmepriv) */ -{ - int res; - - res = _rtw_init_mlme_priv(padapter);/* (pmlmepriv); */ - return res; + return ie + 8; } void rtw_free_mlme_priv(struct mlme_priv *pmlmepriv) @@ -375,15 +367,6 @@ static struct wlan_network *rtw_dequeue_network(struct __queue *queue) } */ -struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv); -struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv)/* _queue *free_queue) */ -{ - struct wlan_network *pnetwork; - - pnetwork = _rtw_alloc_network(pmlmepriv); - return pnetwork; -} - void rtw_free_network_nolock(struct adapter *padapter, struct wlan_network *pnetwork); void rtw_free_network_nolock(struct adapter *padapter, struct wlan_network *pnetwork) { @@ -451,14 +434,14 @@ int is_same_network(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst, u8 fea s_cap = le16_to_cpu(tmps); d_cap = le16_to_cpu(tmpd); - return ((src->Ssid.SsidLength == dst->Ssid.SsidLength) && + return (src->Ssid.SsidLength == dst->Ssid.SsidLength) && /* (src->Configuration.DSConfig == dst->Configuration.DSConfig) && */ ((!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_BSS) == - (d_cap & WLAN_CAPABILITY_BSS))); + (d_cap & WLAN_CAPABILITY_BSS)); } @@ -943,13 +926,6 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf) || _SUCCESS != rtw_sitesurvey_cmd(adapter, &pmlmepriv->assoc_ssid, 1, NULL, 0) ) { rtw_set_to_roam(adapter, 0); -#ifdef CONFIG_INTEL_WIDI - if (adapter->mlmepriv.widi_state == INTEL_WIDI_STATE_ROAMING) { - memset(pmlmepriv->sa_ext, 0x00, L2SDTA_SERVICE_VE_LEN); - intel_widi_wk_cmd(adapter, INTEL_WIDI_LISTEN_WK, NULL, 0); - DBG_871X("change to widi listen\n"); - } -#endif /* CONFIG_INTEL_WIDI */ rtw_free_assoc_resources(adapter, 1); rtw_indicate_disconnect(adapter); } else { @@ -1108,14 +1084,6 @@ void rtw_indicate_connect(struct adapter *padapter) } rtw_set_to_roam(padapter, 0); -#ifdef CONFIG_INTEL_WIDI - if (padapter->mlmepriv.widi_state == INTEL_WIDI_STATE_ROAMING) { - memset(pmlmepriv->sa_ext, 0x00, L2SDTA_SERVICE_VE_LEN); - intel_widi_wk_cmd(padapter, INTEL_WIDI_LISTEN_WK, NULL, 0); - DBG_871X("change to widi listen\n"); - } -#endif /* CONFIG_INTEL_WIDI */ - rtw_set_scan_deny(padapter, 3000); RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("-rtw_indicate_connect: fw_state = 0x%08x\n", get_fwstate(pmlmepriv))); @@ -1703,11 +1671,6 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf) roam = true; roam_target = pmlmepriv->roam_network; } -#ifdef CONFIG_INTEL_WIDI - else if (adapter->mlmepriv.widi_state == INTEL_WIDI_STATE_CONNECTED) { - roam = true; - } -#endif /* CONFIG_INTEL_WIDI */ if (roam == true) { if (rtw_to_roam(adapter) > 0) @@ -1732,11 +1695,6 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf) } spin_unlock_bh(&(pmlmepriv->scanned_queue.lock)); -#ifdef CONFIG_INTEL_WIDI - if (!rtw_to_roam(adapter)) - process_intel_widi_disconnect(adapter, 1); -#endif /* CONFIG_INTEL_WIDI */ - _rtw_roaming(adapter, roam_target); } @@ -1833,13 +1791,6 @@ void _rtw_join_timeout_handler(struct timer_list *t) } break; } else { -#ifdef CONFIG_INTEL_WIDI - if (adapter->mlmepriv.widi_state == INTEL_WIDI_STATE_ROAMING) { - memset(pmlmepriv->sa_ext, 0x00, L2SDTA_SERVICE_VE_LEN); - intel_widi_wk_cmd(adapter, INTEL_WIDI_LISTEN_WK, NULL, 0); - DBG_871X("change to widi listen\n"); - } -#endif /* CONFIG_INTEL_WIDI */ DBG_871X("%s We've try roaming but fail\n", __func__); rtw_indicate_disconnect(adapter); break; diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c index ebb45acb4446..d110d4514771 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -697,10 +697,9 @@ unsigned int OnProbeReq(struct adapter *padapter, union recv_frame *precv_frame) psta->aid = 0; DBG_871X("no room for more AIDs\n"); return _SUCCESS; - } else { - pstapriv->sta_aid[psta->aid - 1] = psta; - DBG_871X("allocate new AID = (%d)\n", psta->aid); } + pstapriv->sta_aid[psta->aid - 1] = psta; + DBG_871X("allocate new AID = (%d)\n", psta->aid); } psta->qos_option = 1; @@ -816,7 +815,7 @@ unsigned int OnBeacon(struct adapter *padapter, union recv_frame *precv_frame) update_network(&(pmlmepriv->cur_network.network), pbss, padapter, true); rtw_get_bcn_info(&(pmlmepriv->cur_network)); } - kfree((u8 *)pbss); + kfree(pbss); } /* check the vendor of the assoc AP */ @@ -1982,7 +1981,7 @@ unsigned int OnAction_back(struct adapter *padapter, union recv_frame *precv_fra if (status == 0) { /* successful */ DBG_871X("agg_enable for TID =%d\n", tid); - psta->htpriv.agg_enable_bitmap |= 1 << tid; + psta->htpriv.agg_enable_bitmap |= BIT(tid); psta->htpriv.candidate_tid_bitmap &= ~BIT(tid); } else { psta->htpriv.agg_enable_bitmap &= ~BIT(tid); @@ -2000,8 +1999,10 @@ unsigned int OnAction_back(struct adapter *padapter, union recv_frame *precv_fra case RTW_WLAN_ACTION_DELBA: /* DELBA */ if ((frame_body[3] & BIT(3)) == 0) { - psta->htpriv.agg_enable_bitmap &= ~(1 << ((frame_body[3] >> 4) & 0xf)); - psta->htpriv.candidate_tid_bitmap &= ~(1 << ((frame_body[3] >> 4) & 0xf)); + psta->htpriv.agg_enable_bitmap &= + ~BIT((frame_body[3] >> 4) & 0xf); + psta->htpriv.candidate_tid_bitmap &= + ~BIT((frame_body[3] >> 4) & 0xf); /* reason_code = frame_body[4] | (frame_body[5] << 8); */ reason_code = RTW_GET_LE16(&frame_body[4]); @@ -3512,7 +3513,7 @@ int issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned int pow /* da == NULL, assum it's null data for sta to ap*/ - if (da == NULL) + if (!da) da = get_my_bssid(&(pmlmeinfo->network)); psta = rtw_get_stainfo(&padapter->stapriv, da); @@ -3569,7 +3570,6 @@ exit: */ s32 issue_nulldata_in_interrupt(struct adapter *padapter, u8 *da) { - int ret; struct mlme_ext_priv *pmlmeext; struct mlme_ext_info *pmlmeinfo; @@ -3578,12 +3578,10 @@ s32 issue_nulldata_in_interrupt(struct adapter *padapter, u8 *da) pmlmeinfo = &pmlmeext->mlmext_info; /* da == NULL, assum it's null data for sta to ap*/ - if (da == NULL) + if (!da) da = get_my_bssid(&(pmlmeinfo->network)); - ret = _issue_nulldata(padapter, da, 0, false); - - return ret; + return _issue_nulldata(padapter, da, 0, false); } /* when wait_ack is ture, this function shoule be called at process context */ @@ -3675,7 +3673,7 @@ int issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16 tid, int struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); /* da == NULL, assum it's null data for sta to ap*/ - if (da == NULL) + if (!da) da = get_my_bssid(&(pmlmeinfo->network)); do { @@ -3958,7 +3956,7 @@ void issue_action_BA(struct adapter *padapter, unsigned char *raddr, unsigned ch /* A-MSDU NOT Supported */ BA_para_set = 0; /* immediate Block Ack */ - BA_para_set |= (1 << 1) & IEEE80211_ADDBA_PARAM_POLICY_MASK; + BA_para_set |= BIT(1) & IEEE80211_ADDBA_PARAM_POLICY_MASK; /* TID */ BA_para_set |= (status << 2) & IEEE80211_ADDBA_PARAM_TID_MASK; /* max buffer size is 8 MSDU */ @@ -4579,12 +4577,6 @@ u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, str pmlmepriv->num_sta_no_ht++; } -#ifdef CONFIG_INTEL_WIDI - /* process_intel_widi_query_or_tigger(padapter, bssid); */ - if (process_intel_widi_query_or_tigger(padapter, bssid)) - return _FAIL; -#endif /* CONFIG_INTEL_WIDI */ - #if defined(DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED) & 1 if (strcmp(bssid->Ssid.Ssid, DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED) == 0) { DBG_871X("Receiving %s("MAC_FMT", DSConfig:%u) from ch%u with ss:%3u, sq:%3u, RawRSSI:%3ld\n" @@ -5052,7 +5044,7 @@ void report_survey_event(struct adapter *padapter, union recv_frame *precv_frame cmdsz = (sizeof(struct survey_event) + sizeof(struct C2HEvent_Header)); pevtcmd = rtw_zmalloc(cmdsz); if (pevtcmd == NULL) { - kfree((u8 *)pcmd_obj); + kfree(pcmd_obj); return; } @@ -5073,8 +5065,8 @@ void report_survey_event(struct adapter *padapter, union recv_frame *precv_frame psurvey_evt = (struct survey_event *)(pevtcmd + sizeof(struct C2HEvent_Header)); if (collect_bss_info(padapter, precv_frame, (struct wlan_bssid_ex *)&psurvey_evt->bss) == _FAIL) { - kfree((u8 *)pcmd_obj); - kfree((u8 *)pevtcmd); + kfree(pcmd_obj); + kfree(pevtcmd); return; } @@ -5105,7 +5097,7 @@ void report_surveydone_event(struct adapter *padapter) cmdsz = (sizeof(struct surveydone_event) + sizeof(struct C2HEvent_Header)); pevtcmd = rtw_zmalloc(cmdsz); if (pevtcmd == NULL) { - kfree((u8 *)pcmd_obj); + kfree(pcmd_obj); return; } @@ -5152,7 +5144,7 @@ void report_join_res(struct adapter *padapter, int res) cmdsz = (sizeof(struct joinbss_event) + sizeof(struct C2HEvent_Header)); pevtcmd = rtw_zmalloc(cmdsz); if (pevtcmd == NULL) { - kfree((u8 *)pcmd_obj); + kfree(pcmd_obj); return; } @@ -5203,7 +5195,7 @@ void report_wmm_edca_update(struct adapter *padapter) cmdsz = (sizeof(struct wmm_event) + sizeof(struct C2HEvent_Header)); pevtcmd = rtw_zmalloc(cmdsz); if (pevtcmd == NULL) { - kfree((u8 *)pcmd_obj); + kfree(pcmd_obj); return; } @@ -5250,7 +5242,7 @@ void report_del_sta_event(struct adapter *padapter, unsigned char *MacAddr, unsi cmdsz = (sizeof(struct stadel_event) + sizeof(struct C2HEvent_Header)); pevtcmd = rtw_zmalloc(cmdsz); if (pevtcmd == NULL) { - kfree((u8 *)pcmd_obj); + kfree(pcmd_obj); return; } @@ -5305,7 +5297,7 @@ void report_add_sta_event(struct adapter *padapter, unsigned char *MacAddr, int cmdsz = (sizeof(struct stassoc_event) + sizeof(struct C2HEvent_Header)); pevtcmd = rtw_zmalloc(cmdsz); if (pevtcmd == NULL) { - kfree((u8 *)pcmd_obj); + kfree(pcmd_obj); return; } @@ -5713,11 +5705,6 @@ void linked_status_chk(struct adapter *padapter) /* Marked by Kurt 20130715 */ /* For WiDi 3.5 and latered on, they don't ask WiDi sink to do roaming, so we could not check rx limit that strictly. */ /* todo: To check why we under miracast session, rx_chk would be false */ - /* ifdef CONFIG_INTEL_WIDI */ - /* if (padapter->mlmepriv.widi_state != INTEL_WIDI_STATE_NONE) */ - /* rx_chk_limit = 1; */ - /* endif */ - psta = rtw_get_stainfo(pstapriv, pmlmeinfo->network.MacAddress); if (psta != NULL) { if (chk_ap_is_alive(padapter, psta) == false) @@ -5836,7 +5823,7 @@ void survey_timer_hdl(struct timer_list *t) psurveyPara = rtw_zmalloc(sizeof(struct sitesurvey_parm)); if (psurveyPara == NULL) { - kfree((unsigned char *)ph2c); + kfree(ph2c); goto exit_survey_timer_hdl; } @@ -6603,7 +6590,7 @@ u8 set_tx_beacon_cmd(struct adapter *padapter) ptxBeacon_parm = rtw_zmalloc(sizeof(struct Tx_Beacon_param)); if (ptxBeacon_parm == NULL) { - kfree((unsigned char *)ph2c); + kfree(ph2c); res = _FAIL; goto exit; } diff --git a/drivers/staging/rtl8723bs/core/rtw_sta_mgt.c b/drivers/staging/rtl8723bs/core/rtw_sta_mgt.c index b9d36db762a9..bdc52d8d5625 100644 --- a/drivers/staging/rtl8723bs/core/rtw_sta_mgt.c +++ b/drivers/staging/rtl8723bs/core/rtw_sta_mgt.c @@ -75,7 +75,6 @@ u32 _rtw_init_sta_priv(struct sta_priv *pstapriv) psta = (struct sta_info *)(pstapriv->pstainfo_buf); - for (i = 0; i < NUM_STA; i++) { _rtw_init_stainfo(psta); @@ -204,8 +203,7 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr) if (list_empty(&pfree_sta_queue->queue)) { /* spin_unlock_bh(&(pfree_sta_queue->lock)); */ spin_unlock_bh(&(pstapriv->sta_hash_lock)); - psta = NULL; - return psta; + return NULL; } else { psta = LIST_CONTAINOR(get_next(&pfree_sta_queue->queue), struct sta_info, list); @@ -318,7 +316,7 @@ u32 rtw_free_stainfo(struct adapter *padapter, struct sta_info *psta) struct sta_priv *pstapriv = &padapter->stapriv; struct hw_xmit *phwxmit; - if (psta == NULL) + if (!psta) goto exit; @@ -394,7 +392,6 @@ u32 rtw_free_stainfo(struct adapter *padapter, struct sta_info *psta) ); pstapriv->asoc_sta_count--; - /* re-init sta_info; 20061114 will be init in alloc_stainfo */ /* _rtw_init_sta_xmit_priv(&psta->sta_xmitpriv); */ /* _rtw_init_sta_recv_priv(&psta->sta_recvpriv); */ @@ -437,7 +434,6 @@ u32 rtw_free_stainfo(struct adapter *padapter, struct sta_info *psta) if (!(psta->state & WIFI_AP_STATE)) rtw_hal_set_odm_var(padapter, HAL_ODM_STA_INFO, psta, false); - /* release mac id for non-bc/mc station, */ rtw_release_macid(pstapriv->padapter, psta); @@ -524,7 +520,7 @@ struct sta_info *rtw_get_stainfo(struct sta_priv *pstapriv, u8 *hwaddr) u8 *addr; u8 bc_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; - if (hwaddr == NULL) + if (!hwaddr) return NULL; if (IS_MCAST(hwaddr)) @@ -569,7 +565,7 @@ u32 rtw_init_bcmc_stainfo(struct adapter *padapter) psta = rtw_alloc_stainfo(pstapriv, bcast_addr); - if (psta == NULL) { + if (!psta) { res = _FAIL; RT_TRACE(_module_rtl871x_sta_mgt_c_, _drv_err_, ("rtw_alloc_stainfo fail")); goto exit; @@ -583,15 +579,12 @@ exit: return _SUCCESS; } - struct sta_info *rtw_get_bcmc_stainfo(struct adapter *padapter) { - struct sta_info *psta; struct sta_priv *pstapriv = &padapter->stapriv; u8 bc_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; - psta = rtw_get_stainfo(pstapriv, bc_addr); - return psta; + return rtw_get_stainfo(pstapriv, bc_addr); } u8 rtw_access_ctrl(struct adapter *padapter, u8 *mac_addr) @@ -620,7 +613,6 @@ u8 rtw_access_ctrl(struct adapter *padapter, u8 *mac_addr) } spin_unlock_bh(&(pacl_node_q->lock)); - if (pacl_list->mode == 1) /* accept unless in deny list */ res = !match; diff --git a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c index 2c172966ea60..fdbf967812f9 100644 --- a/drivers/staging/rtl8723bs/core/rtw_wlan_util.c +++ b/drivers/staging/rtl8723bs/core/rtw_wlan_util.c @@ -518,7 +518,7 @@ unsigned int decide_wait_for_beacon_timeout(unsigned int bcn_interval) else if ((bcn_interval << 2) > WAIT_FOR_BCN_TO_MAX) return WAIT_FOR_BCN_TO_MAX; else - return ((bcn_interval << 2)); + return bcn_interval << 2; } void invalidate_cam_all(struct adapter *padapter) diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rtl8723bs/core/rtw_xmit.c index b87f13a0b563..2bb679e54dc7 100644 --- a/drivers/staging/rtl8723bs/core/rtw_xmit.c +++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c @@ -2861,8 +2861,6 @@ void xmit_delivery_enabled_frames(struct adapter *padapter, struct sta_info *pst /* spin_unlock_bh(&psta->sleep_q.lock); */ spin_unlock_bh(&pxmitpriv->lock); - - return; } void enqueue_pending_xmitbuf( |