staging:rwl8188eu:rtw_ap.c remove unnecessary braces
PATCH v2 1/2 staging:rwl8188eu:rtw_ap.c remove unnecessary braces
Removed unnecessary braces
Signed-off-by Scott Matheina <[email protected]>
--- drivers/staging/rtl8188eu/core/rtw_ap.c | 106 ++++++++++++++++---------------- 1 file changed, 53 insertions(+), 53 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ap.c +53 -53
@@ -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 ;
@@ -310,9 +310,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); }
@@ -456,7 +456,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)
@@ -548,7 +548,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);
@@ -630,9 +630,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;
@@ -700,7 +700,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__);
@@ -733,12 +733,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;
@@ -869,7 +869,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;
@@ -905,7 +905,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 */
@@ -1150,7 +1150,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;
@@ -1168,12 +1168,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];
@@ -1195,7 +1195,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; }
@@ -1210,7 +1210,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;
@@ -1230,7 +1230,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 ;
@@ -1238,10 +1238,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 ;
@@ -1275,10 +1275,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;
@@ -1338,8 +1338,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 ;
@@ -1384,7 +1384,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)
@@ -1477,8 +1477,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) {
@@ -1612,8 +1612,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;
@@ -1708,9 +1708,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; }
@@ -1721,7 +1721,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));
@@ -1758,7 +1758,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)
@@ -1795,7 +1795,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;
@@ -1828,7 +1828,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++) {
@@ -1843,7 +1843,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;
@@ -1857,7 +1857,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) {
@@ -1872,7 +1872,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);
@@ -1882,9 +1882,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);
--
2.7.4
PATCH v2 2/2 staging:rtl8188eu:core Fixes Alignment should match opening brace
Fixed style issue: Alignment should match open brace
Signed-off-by Scott Matheina <[email protected]>
--- drivers/staging/rtl8188eu/core/rtw_ap.c | 38 ++++++++++++++++----------------- 1 file changed, 18 insertions(+), 20 deletions(-)
drivers/staging/rtl8188eu/core/rtw_ap.c +18 -20
@@ -94,10 +94,9 @@ static void update_BCNTIM(struct adapter *padapter) offset += pnetwork_mlmeext->Ssid.SsidLength +2 ;/* get supported rates len */ - p =rtw_get_ie (pie + _BEACON_IE_OFFSET_, - _SUPPORTEDRATES_IE_, &tmp_len, - (pnetwork_mlmeext->IELength - - _BEACON_IE_OFFSET_)); + p =rtw_get_ie (pie + _BEACON_IE_OFFSET_, _SUPPORTEDRATES_IE_, + &tmp_len, (pnetwork_mlmeext->IELength - + _BEACON_IE_OFFSET_));if (p) offset += tmp_len+2 ;
@@ -116,13 +115,12 @@ static void update_BCNTIM(struct adapter *padapter)if (remainder_ielen >0 ) { pbackup_remainder_ie =rtw_malloc (remainder_ielen);if (pbackup_remainder_ie && premainder_ie) -memcpy (pbackup_remainder_ie, - premainder_ie, remainder_ielen); +memcpy (pbackup_remainder_ie, premainder_ie, + remainder_ielen); } *dst_ie++ = _TIM_IE_; -if ((pstapriv->tim_bitmap&0xff00 ) && - (pstapriv->tim_bitmap&0x00fc )) +if ((pstapriv->tim_bitmap&0xff00 ) && (pstapriv->tim_bitmap&0x00fc )) tim_ielen =5 ;else tim_ielen =4 ;
@@ -157,7 +155,7 @@ static void update_BCNTIM(struct adapter *padapter) }void rtw_add_bcn_ie (struct adapter *padapter,struct wlan_bssid_ex *pnetwork, -u8 index,u8 *data,u8 len) +u8 index,u8 *data,u8 len) {struct ndis_802_11_var_ie *pIE;u8 bmatch = false;
@@ -201,8 +199,8 @@ void rtw_add_bcn_ie(struct adapter *padapter, struct wlan_bssid_ex *pnetwork,if (remainder_ielen >0 ) { pbackup_remainder_ie =rtw_malloc (remainder_ielen);if (pbackup_remainder_ie && premainder_ie) -memcpy (pbackup_remainder_ie, - premainder_ie, remainder_ielen); +memcpy (pbackup_remainder_ie, premainder_ie, + remainder_ielen); } *dst_ie++ = index;
@@ -223,7 +221,7 @@ void rtw_add_bcn_ie(struct adapter *padapter, struct wlan_bssid_ex *pnetwork, }void rtw_remove_bcn_ie (struct adapter *padapter,struct wlan_bssid_ex *pnetwork, -u8 index) +u8 index) {u8 *p, *dst_ie =NULL , *premainder_ie =NULL ;u8 *pbackup_remainder_ie =NULL ;
@@ -247,8 +245,8 @@ void rtw_remove_bcn_ie(struct adapter *padapter, struct wlan_bssid_ex *pnetwork,if (remainder_ielen >0 ) { pbackup_remainder_ie =rtw_malloc (remainder_ielen);if (pbackup_remainder_ie && premainder_ie) -memcpy (pbackup_remainder_ie, - premainder_ie, remainder_ielen); +memcpy (pbackup_remainder_ie, premainder_ie, + remainder_ielen); }/* copy remainder IE */
@@ -361,8 +359,8 @@ void expire_timeout_chk(struct adapter *padapter)* for this station */ pstapriv->tim_bitmap |=BIT (psta->aid); -update_beacon (padapter, _TIM_IE_, -NULL , false); +update_beacon (padapter, _TIM_IE_,NULL , + false);if (!pmlmeext->active_keep_alive_check)continue ;
@@ -1573,8 +1571,8 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) pmlmepriv->num_sta_ht_no_gf++; }DBG_88E ("%s STA %pM - no greenfield, num of non-gf stations %d\n" , - __func__, (psta->hwaddr), - pmlmepriv->num_sta_ht_no_gf); + __func__, (psta->hwaddr), + pmlmepriv->num_sta_ht_no_gf); }if ((ht_capab &IEEE80211_HT_CAP_SUP_WIDTH ) ==0 ) {
@@ -1583,8 +1581,8 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta) pmlmepriv->num_sta_ht_20mhz++; }DBG_88E ("%s STA %pM - 20 MHz HT, num of 20MHz HT STAs %d\n" , - __func__, (psta->hwaddr), - pmlmepriv->num_sta_ht_20mhz); + __func__, (psta->hwaddr), + pmlmepriv->num_sta_ht_20mhz); } }else {if (!psta->no_ht_set) {
--
2.7.4