redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

staging: rtl8723au: Eliminate stainfo_by_offset spaghetti

Browse source 
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jes Sorensen 2014-05-09 15:03:47 +02:00 committed by Greg Kroah-Hartman
parent ec838b0bc9
commit 6964213a94
3 changed files with 13 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
drivers/staging/rtl8723au/core/rtw_ap.c
View file

@ -186,7 +186,7 @@ void expire_timeout_chk23a(struct rtw_adapter *padapter)
struct sta_info *psta; struct sta_info *psta;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
u8 chk_alive_num = 0; u8 chk_alive_num = 0;
char chk_alive_list[NUM_STA]; struct sta_info *chk_alive_list[NUM_STA];
int i; int i;
spin_lock_bh(&pstapriv->auth_list_lock); spin_lock_bh(&pstapriv->auth_list_lock);
@ -260,13 +260,7 @@ void expire_timeout_chk23a(struct rtw_adapter *padapter)
} }
if (pmlmeext->active_keep_alive_check) { if (pmlmeext->active_keep_alive_check) {
int stainfo_offset; chk_alive_list[chk_alive_num++] = psta;
stainfo_offset = rtw_stainfo_offset23a(pstapriv, psta);
if (stainfo_offset_valid(stainfo_offset)) {
chk_alive_list[chk_alive_num++] = stainfo_offset;
}
continue; continue;
} }
@ -300,14 +294,14 @@ void expire_timeout_chk23a(struct rtw_adapter *padapter)
if (rtw_get_oper_ch23a(padapter) != pmlmeext->cur_channel) { if (rtw_get_oper_ch23a(padapter) != pmlmeext->cur_channel) {
backup_oper_channel = rtw_get_oper_ch23a(padapter); backup_oper_channel = rtw_get_oper_ch23a(padapter);
SelectChannel23a(padapter, pmlmeext->cur_channel); SelectChannel23a(padapter, pmlmeext->cur_channel);
} }
/* issue null data to check sta alive*/ /* issue null data to check sta alive*/
for (i = 0; i < chk_alive_num; i++) { for (i = 0; i < chk_alive_num; i++) {
int ret = _FAIL; int ret = _FAIL;
psta = rtw_get_stainfo23a_by_offset23a(pstapriv, chk_alive_list[i]); psta = chk_alive_list[i];
if (!(psta->state &_FW_LINKED)) if (!(psta->state &_FW_LINKED))
continue; continue;
@ -1811,7 +1805,7 @@ int rtw_sta_flush23a(struct rtw_adapter *padapter)
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
u8 bc_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; u8 bc_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
u8 chk_alive_num = 0; u8 chk_alive_num = 0;
char chk_alive_list[NUM_STA]; struct sta_info *chk_alive_list[NUM_STA];
int i; int i;
DBG_8723A(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(padapter->pnetdev)); DBG_8723A(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(padapter->pnetdev));
@ -1823,8 +1817,6 @@ int rtw_sta_flush23a(struct rtw_adapter *padapter)
phead = &pstapriv->asoc_list; phead = &pstapriv->asoc_list;
list_for_each_safe(plist, ptmp, phead) { list_for_each_safe(plist, ptmp, phead) {
int stainfo_offset;
psta = container_of(plist, struct sta_info, asoc_list); psta = container_of(plist, struct sta_info, asoc_list);
/* Remove sta from asoc_list */ /* Remove sta from asoc_list */
@ -1832,18 +1824,14 @@ int rtw_sta_flush23a(struct rtw_adapter *padapter)
pstapriv->asoc_list_cnt--; pstapriv->asoc_list_cnt--;
/* Keep sta for ap_free_sta23a() beyond this asoc_list loop */ /* Keep sta for ap_free_sta23a() beyond this asoc_list loop */
stainfo_offset = rtw_stainfo_offset23a(pstapriv, psta); chk_alive_list[chk_alive_num++] = psta;
if (stainfo_offset_valid(stainfo_offset)) {
chk_alive_list[chk_alive_num++] = stainfo_offset;
}
} }
spin_unlock_bh(&pstapriv->asoc_list_lock); spin_unlock_bh(&pstapriv->asoc_list_lock);
/* For each sta in chk_alive_list, call ap_free_sta23a */ /* For each sta in chk_alive_list, call ap_free_sta23a */
for (i = 0; i < chk_alive_num; i++) { for (i = 0; i < chk_alive_num; i++)
psta = rtw_get_stainfo23a_by_offset23a(pstapriv, chk_alive_list[i]); ap_free_sta23a(padapter, chk_alive_list[i], true,
ap_free_sta23a(padapter, psta, true, WLAN_REASON_DEAUTH_LEAVING); WLAN_REASON_DEAUTH_LEAVING);
}
issue_deauth23a(padapter, bc_addr, WLAN_REASON_DEAUTH_LEAVING); issue_deauth23a(padapter, bc_addr, WLAN_REASON_DEAUTH_LEAVING);
@ -1904,7 +1892,7 @@ void rtw_ap_restore_network(struct rtw_adapter *padapter)
struct security_priv *psecuritypriv = &padapter->securitypriv; struct security_priv *psecuritypriv = &padapter->securitypriv;
struct list_head *phead, *plist, *ptmp; struct list_head *phead, *plist, *ptmp;
u8 chk_alive_num = 0; u8 chk_alive_num = 0;
char chk_alive_list[NUM_STA]; struct sta_info *chk_alive_list[NUM_STA];
int i; int i;
rtw_setopmode_cmd23a(padapter, Ndis802_11APMode); rtw_setopmode_cmd23a(padapter, Ndis802_11APMode);
@ -1931,26 +1919,17 @@ void rtw_ap_restore_network(struct rtw_adapter *padapter)
phead = &pstapriv->asoc_list; phead = &pstapriv->asoc_list;
list_for_each_safe(plist, ptmp, phead) { list_for_each_safe(plist, ptmp, phead) {
int stainfo_offset;
psta = container_of(plist, struct sta_info, asoc_list); psta = container_of(plist, struct sta_info, asoc_list);
stainfo_offset = rtw_stainfo_offset23a(pstapriv, psta); chk_alive_list[chk_alive_num++] = psta;
if (stainfo_offset_valid(stainfo_offset)) {
chk_alive_list[chk_alive_num++] = stainfo_offset;
}
} }
spin_unlock_bh(&pstapriv->asoc_list_lock); spin_unlock_bh(&pstapriv->asoc_list_lock);
for (i = 0; i < chk_alive_num; i++) { for (i = 0; i < chk_alive_num; i++) {
psta = rtw_get_stainfo23a_by_offset23a(pstapriv, chk_alive_list[i]); psta = chk_alive_list[i];
if (psta == NULL) { if (psta->state &_FW_LINKED) {
DBG_8723A(FUNC_ADPT_FMT" sta_info is null\n", FUNC_ADPT_ARG(padapter));
}
else if (psta->state &_FW_LINKED)
{
Update_RA_Entry23a(padapter, psta); Update_RA_Entry23a(padapter, psta);
/* pairwise key */ /* pairwise key */
rtw_setstakey_cmd23a(padapter, (unsigned char *)psta, true); rtw_setstakey_cmd23a(padapter, (unsigned char *)psta, true);

16
drivers/staging/rtl8723au/core/rtw_sta_mgt.c
View file

@ -92,22 +92,6 @@ u32 _rtw_init_sta_priv23a(struct sta_priv *pstapriv)
return _SUCCESS; return _SUCCESS;
} }
inline int rtw_stainfo_offset23a(struct sta_priv *stapriv, struct sta_info *sta)
{
int offset = (((u8 *)sta) - stapriv->pstainfo_buf)/sizeof(struct sta_info);
if (!stainfo_offset_valid(offset))
DBG_8723A("%s invalid offset(%d), out of range!!!", __func__, offset);
return offset;
}
inline struct sta_info *rtw_get_stainfo23a_by_offset23a(struct sta_priv *stapriv, int offset)
{
if (!stainfo_offset_valid(offset))
DBG_8723A("%s invalid offset(%d), out of range!!!", __func__, offset);
return (struct sta_info *)(stapriv->pstainfo_buf + offset * sizeof(struct sta_info));
}
/* this function is used to free the memory of lock || sema for all stainfos */ /* this function is used to free the memory of lock || sema for all stainfos */
static void rtw_mfree_all_stainfo(struct sta_priv *pstapriv) static void rtw_mfree_all_stainfo(struct sta_priv *pstapriv)
{ {

5
drivers/staging/rtl8723au/include/sta_info.h
View file

@ -369,11 +369,6 @@ static inline u32 wifi_mac_hash(const u8 *mac)
u32 _rtw_init_sta_priv23a(struct sta_priv *pstapriv); u32 _rtw_init_sta_priv23a(struct sta_priv *pstapriv);
u32 _rtw_free_sta_priv23a(struct sta_priv *pstapriv); u32 _rtw_free_sta_priv23a(struct sta_priv *pstapriv);
#define stainfo_offset_valid(offset) (offset < NUM_STA && offset >= 0)
int rtw_stainfo_offset23a(struct sta_priv *stapriv, struct sta_info *sta);
struct sta_info *rtw_get_stainfo23a_by_offset23a(struct sta_priv *stapriv,
int offset);
struct sta_info *rtw_alloc_stainfo23a(struct sta_priv *pstapriv, u8 *hwaddr); struct sta_info *rtw_alloc_stainfo23a(struct sta_priv *pstapriv, u8 *hwaddr);
u32 rtw_free_stainfo23a(struct rtw_adapter *padapter, struct sta_info *psta); u32 rtw_free_stainfo23a(struct rtw_adapter *padapter, struct sta_info *psta);
void rtw_free_all_stainfo23a(struct rtw_adapter *padapter); void rtw_free_all_stainfo23a(struct rtw_adapter *padapter);