mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-05 14:40:12 -04:00
staging:rtl8188eu:rtw_ap.c remove unnecessary braces
Removed unnecessary braces Signed-off-by: Scott Matheina <scott@matheina.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Scott Matheina
committed by
Greg Kroah-Hartman
Greg Kroah-Hartman
parent
759fc3c1e9
commit
8943880eff
@@ -26,7 +26,7 @@
|
||||
|
||||
void init_mlme_ap_info(struct adapter *padapter)
|
||||
{
|
||||
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
struct sta_priv *pstapriv = &padapter->stapriv;
|
||||
struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;
|
||||
|
||||
@@ -43,7 +43,7 @@ void free_mlme_ap_info(struct adapter *padapter)
|
||||
{
|
||||
struct sta_info *psta = NULL;
|
||||
struct sta_priv *pstapriv = &padapter->stapriv;
|
||||
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
|
||||
@@ -59,17 +59,17 @@ void free_mlme_ap_info(struct adapter *padapter)
|
||||
|
||||
/* free bc/mc sta_info */
|
||||
psta = rtw_get_bcmc_stainfo(padapter);
|
||||
spin_lock_bh(&(pstapriv->sta_hash_lock));
|
||||
spin_lock_bh(&pstapriv->sta_hash_lock);
|
||||
rtw_free_stainfo(padapter, psta);
|
||||
spin_unlock_bh(&(pstapriv->sta_hash_lock));
|
||||
spin_unlock_bh(&pstapriv->sta_hash_lock);
|
||||
}
|
||||
|
||||
static void update_BCNTIM(struct adapter *padapter)
|
||||
{
|
||||
struct sta_priv *pstapriv = &padapter->stapriv;
|
||||
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
struct wlan_bssid_ex *pnetwork_mlmeext = &(pmlmeinfo->network);
|
||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
|
||||
struct wlan_bssid_ex *pnetwork_mlmeext = &pmlmeinfo->network;
|
||||
unsigned char *pie = pnetwork_mlmeext->IEs;
|
||||
u8 *p, *dst_ie, *premainder_ie = NULL;
|
||||
u8 *pbackup_remainder_ie = NULL;
|
||||
@@ -308,9 +308,9 @@ void expire_timeout_chk(struct adapter *padapter)
|
||||
|
||||
spin_unlock_bh(&pstapriv->auth_list_lock);
|
||||
|
||||
spin_lock_bh(&(pstapriv->sta_hash_lock));
|
||||
spin_lock_bh(&pstapriv->sta_hash_lock);
|
||||
rtw_free_stainfo(padapter, psta);
|
||||
spin_unlock_bh(&(pstapriv->sta_hash_lock));
|
||||
spin_unlock_bh(&pstapriv->sta_hash_lock);
|
||||
|
||||
spin_lock_bh(&pstapriv->auth_list_lock);
|
||||
}
|
||||
@@ -454,7 +454,7 @@ void add_RATid(struct adapter *padapter, struct sta_info *psta, u8 rssi_level)
|
||||
unsigned char limit;
|
||||
unsigned int tx_ra_bitmap = 0;
|
||||
struct ht_priv *psta_ht = NULL;
|
||||
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
struct wlan_bssid_ex *pcur_network = (struct wlan_bssid_ex *)&pmlmepriv->cur_network.network;
|
||||
|
||||
if (psta)
|
||||
@@ -546,7 +546,7 @@ static void update_bmc_sta(struct adapter *padapter)
|
||||
unsigned char network_type, raid;
|
||||
int i, supportRateNum = 0;
|
||||
unsigned int tx_ra_bitmap = 0;
|
||||
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
struct wlan_bssid_ex *pcur_network = (struct wlan_bssid_ex *)&pmlmepriv->cur_network.network;
|
||||
struct sta_info *psta = rtw_get_bcmc_stainfo(padapter);
|
||||
|
||||
@@ -628,9 +628,9 @@ static void update_bmc_sta(struct adapter *padapter)
|
||||
|
||||
void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta)
|
||||
{
|
||||
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
struct security_priv *psecuritypriv = &padapter->securitypriv;
|
||||
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
|
||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
struct ht_priv *phtpriv_ap = &pmlmepriv->htpriv;
|
||||
struct ht_priv *phtpriv_sta = &psta->htpriv;
|
||||
|
||||
@@ -698,7 +698,7 @@ static void update_hw_ht_param(struct adapter *padapter)
|
||||
unsigned char max_AMPDU_len;
|
||||
unsigned char min_MPDU_spacing;
|
||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
|
||||
|
||||
DBG_88E("%s\n", __func__);
|
||||
|
||||
@@ -731,12 +731,12 @@ static void start_bss_network(struct adapter *padapter, u8 *pbuf)
|
||||
u32 acparm;
|
||||
int ie_len;
|
||||
struct registry_priv *pregpriv = &padapter->registrypriv;
|
||||
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
|
||||
struct security_priv *psecuritypriv = &(padapter->securitypriv);
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
struct security_priv *psecuritypriv = &padapter->securitypriv;
|
||||
struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)&pmlmepriv->cur_network.network;
|
||||
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
struct wlan_bssid_ex *pnetwork_mlmeext = &(pmlmeinfo->network);
|
||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
|
||||
struct wlan_bssid_ex *pnetwork_mlmeext = &pmlmeinfo->network;
|
||||
struct HT_info_element *pht_info = NULL;
|
||||
|
||||
bcn_interval = (u16)pnetwork->Configuration.BeaconPeriod;
|
||||
@@ -867,7 +867,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)
|
||||
u8 WMM_PARA_IE[] = {0x00, 0x50, 0xf2, 0x02, 0x01, 0x01};
|
||||
struct registry_priv *pregistrypriv = &padapter->registrypriv;
|
||||
struct security_priv *psecuritypriv = &padapter->securitypriv;
|
||||
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
struct wlan_bssid_ex *pbss_network = (struct wlan_bssid_ex *)&pmlmepriv->cur_network.network;
|
||||
u8 *ie = pbss_network->IEs;
|
||||
|
||||
@@ -903,7 +903,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)
|
||||
|
||||
pbss_network->Rssi = 0;
|
||||
|
||||
ether_addr_copy(pbss_network->MacAddress, myid(&(padapter->eeprompriv)));
|
||||
ether_addr_copy(pbss_network->MacAddress, myid(&padapter->eeprompriv));
|
||||
|
||||
/* beacon interval */
|
||||
p = rtw_get_beacon_interval_from_ie(ie);/* 8: TimeStamp, 2: Beacon Interval 2:Capability */
|
||||
@@ -1148,7 +1148,7 @@ int rtw_acl_add_sta(struct adapter *padapter, u8 *addr)
|
||||
if ((NUM_ACL - 1) < pacl_list->num)
|
||||
return -1;
|
||||
|
||||
spin_lock_bh(&(pacl_node_q->lock));
|
||||
spin_lock_bh(&pacl_node_q->lock);
|
||||
|
||||
phead = get_list_head(pacl_node_q);
|
||||
plist = phead->next;
|
||||
@@ -1166,12 +1166,12 @@ int rtw_acl_add_sta(struct adapter *padapter, u8 *addr)
|
||||
}
|
||||
}
|
||||
|
||||
spin_unlock_bh(&(pacl_node_q->lock));
|
||||
spin_unlock_bh(&pacl_node_q->lock);
|
||||
|
||||
if (added)
|
||||
return ret;
|
||||
|
||||
spin_lock_bh(&(pacl_node_q->lock));
|
||||
spin_lock_bh(&pacl_node_q->lock);
|
||||
|
||||
for (i = 0; i < NUM_ACL; i++) {
|
||||
paclnode = &pacl_list->aclnode[i];
|
||||
@@ -1193,7 +1193,7 @@ int rtw_acl_add_sta(struct adapter *padapter, u8 *addr)
|
||||
|
||||
DBG_88E("%s, acl_num =%d\n", __func__, pacl_list->num);
|
||||
|
||||
spin_unlock_bh(&(pacl_node_q->lock));
|
||||
spin_unlock_bh(&pacl_node_q->lock);
|
||||
|
||||
return ret;
|
||||
}
|
||||
@@ -1208,7 +1208,7 @@ int rtw_acl_remove_sta(struct adapter *padapter, u8 *addr)
|
||||
|
||||
DBG_88E("%s(acl_num =%d) =%pM\n", __func__, pacl_list->num, (addr));
|
||||
|
||||
spin_lock_bh(&(pacl_node_q->lock));
|
||||
spin_lock_bh(&pacl_node_q->lock);
|
||||
|
||||
phead = get_list_head(pacl_node_q);
|
||||
plist = phead->next;
|
||||
@@ -1228,7 +1228,7 @@ int rtw_acl_remove_sta(struct adapter *padapter, u8 *addr)
|
||||
}
|
||||
}
|
||||
|
||||
spin_unlock_bh(&(pacl_node_q->lock));
|
||||
spin_unlock_bh(&pacl_node_q->lock);
|
||||
|
||||
DBG_88E("%s, acl_num =%d\n", __func__, pacl_list->num);
|
||||
return 0;
|
||||
@@ -1236,10 +1236,10 @@ int rtw_acl_remove_sta(struct adapter *padapter, u8 *addr)
|
||||
|
||||
static void update_bcn_erpinfo_ie(struct adapter *padapter)
|
||||
{
|
||||
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
|
||||
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network);
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
|
||||
struct wlan_bssid_ex *pnetwork = &pmlmeinfo->network;
|
||||
unsigned char *p, *ie = pnetwork->IEs;
|
||||
u32 len = 0;
|
||||
|
||||
@@ -1273,10 +1273,10 @@ static void update_bcn_wps_ie(struct adapter *padapter)
|
||||
u8 *pwps_ie = NULL, *pwps_ie_src;
|
||||
u8 *premainder_ie, *pbackup_remainder_ie = NULL;
|
||||
uint wps_ielen = 0, wps_offset, remainder_ielen;
|
||||
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
|
||||
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
|
||||
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
|
||||
struct wlan_bssid_ex *pnetwork = &(pmlmeinfo->network);
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
|
||||
struct wlan_bssid_ex *pnetwork = &pmlmeinfo->network;
|
||||
unsigned char *ie = pnetwork->IEs;
|
||||
u32 ielen = pnetwork->IELength;
|
||||
|
||||
@@ -1336,8 +1336,8 @@ void update_beacon(struct adapter *padapter, u8 ie_id, u8 *oui, u8 tx)
|
||||
if (!padapter)
|
||||
return;
|
||||
|
||||
pmlmepriv = &(padapter->mlmepriv);
|
||||
pmlmeext = &(padapter->mlmeextpriv);
|
||||
pmlmepriv = &padapter->mlmepriv;
|
||||
pmlmeext = &padapter->mlmeextpriv;
|
||||
|
||||
if (!pmlmeext->bstart_bss)
|
||||
return;
|
||||
@@ -1382,7 +1382,7 @@ static int rtw_ht_operation_update(struct adapter *padapter)
|
||||
{
|
||||
u16 cur_op_mode, new_op_mode;
|
||||
int op_mode_changes = 0;
|
||||
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
struct ht_priv *phtpriv_ap = &pmlmepriv->htpriv;
|
||||
|
||||
if (pmlmepriv->htpriv.ht_option)
|
||||
@@ -1475,8 +1475,8 @@ void associated_clients_update(struct adapter *padapter, u8 updated)
|
||||
void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta)
|
||||
{
|
||||
u8 beacon_updated = false;
|
||||
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
|
||||
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
|
||||
if (!(psta->flags & WLAN_STA_SHORT_PREAMBLE)) {
|
||||
if (!psta->no_short_preamble_set) {
|
||||
@@ -1610,8 +1610,8 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta)
|
||||
u8 bss_cap_update_on_sta_leave(struct adapter *padapter, struct sta_info *psta)
|
||||
{
|
||||
u8 beacon_updated = false;
|
||||
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
|
||||
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
|
||||
if (!psta)
|
||||
return beacon_updated;
|
||||
@@ -1706,9 +1706,9 @@ u8 ap_free_sta(struct adapter *padapter, struct sta_info *psta,
|
||||
|
||||
beacon_updated = bss_cap_update_on_sta_leave(padapter, psta);
|
||||
|
||||
spin_lock_bh(&(pstapriv->sta_hash_lock));
|
||||
spin_lock_bh(&pstapriv->sta_hash_lock);
|
||||
rtw_free_stainfo(padapter, psta);
|
||||
spin_unlock_bh(&(pstapriv->sta_hash_lock));
|
||||
spin_unlock_bh(&pstapriv->sta_hash_lock);
|
||||
|
||||
return beacon_updated;
|
||||
}
|
||||
@@ -1719,7 +1719,7 @@ int rtw_sta_flush(struct adapter *padapter)
|
||||
struct sta_info *psta = NULL;
|
||||
struct sta_priv *pstapriv = &padapter->stapriv;
|
||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
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};
|
||||
|
||||
DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(padapter->pnetdev));
|
||||
@@ -1756,7 +1756,7 @@ int rtw_sta_flush(struct adapter *padapter)
|
||||
void sta_info_update(struct adapter *padapter, struct sta_info *psta)
|
||||
{
|
||||
int flags = psta->flags;
|
||||
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
|
||||
/* update wmm cap. */
|
||||
if (WLAN_STA_WME&flags)
|
||||
@@ -1793,7 +1793,7 @@ void ap_sta_info_defer_update(struct adapter *padapter, struct sta_info *psta)
|
||||
void start_ap_mode(struct adapter *padapter)
|
||||
{
|
||||
int i;
|
||||
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
struct sta_priv *pstapriv = &padapter->stapriv;
|
||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;
|
||||
@@ -1826,7 +1826,7 @@ void start_ap_mode(struct adapter *padapter)
|
||||
pmlmepriv->wps_assoc_resp_ie = NULL;
|
||||
|
||||
/* for ACL */
|
||||
INIT_LIST_HEAD(&(pacl_list->acl_node_q.queue));
|
||||
INIT_LIST_HEAD(&pacl_list->acl_node_q.queue);
|
||||
pacl_list->num = 0;
|
||||
pacl_list->mode = 0;
|
||||
for (i = 0; i < NUM_ACL; i++) {
|
||||
@@ -1841,7 +1841,7 @@ void stop_ap_mode(struct adapter *padapter)
|
||||
struct rtw_wlan_acl_node *paclnode;
|
||||
struct sta_info *psta = NULL;
|
||||
struct sta_priv *pstapriv = &padapter->stapriv;
|
||||
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
|
||||
struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;
|
||||
struct __queue *pacl_node_q = &pacl_list->acl_node_q;
|
||||
@@ -1855,7 +1855,7 @@ void stop_ap_mode(struct adapter *padapter)
|
||||
padapter->securitypriv.ndisencryptstatus = Ndis802_11WEPDisabled;
|
||||
|
||||
/* for ACL */
|
||||
spin_lock_bh(&(pacl_node_q->lock));
|
||||
spin_lock_bh(&pacl_node_q->lock);
|
||||
phead = get_list_head(pacl_node_q);
|
||||
plist = phead->next;
|
||||
while (phead != plist) {
|
||||
@@ -1870,7 +1870,7 @@ void stop_ap_mode(struct adapter *padapter)
|
||||
pacl_list->num--;
|
||||
}
|
||||
}
|
||||
spin_unlock_bh(&(pacl_node_q->lock));
|
||||
spin_unlock_bh(&pacl_node_q->lock);
|
||||
|
||||
DBG_88E("%s, free acl_node_queue, num =%d\n", __func__, pacl_list->num);
|
||||
|
||||
@@ -1880,9 +1880,9 @@ void stop_ap_mode(struct adapter *padapter)
|
||||
rtw_free_all_stainfo(padapter);
|
||||
|
||||
psta = rtw_get_bcmc_stainfo(padapter);
|
||||
spin_lock_bh(&(pstapriv->sta_hash_lock));
|
||||
spin_lock_bh(&pstapriv->sta_hash_lock);
|
||||
rtw_free_stainfo(padapter, psta);
|
||||
spin_unlock_bh(&(pstapriv->sta_hash_lock));
|
||||
spin_unlock_bh(&pstapriv->sta_hash_lock);
|
||||
|
||||
rtw_init_bcmc_stainfo(padapter);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user