@@ -324,7 +324,7 @@ void add_RATid(struct adapter *padapter, struct sta_info *psta, u8 rssi_level)
324324{
325325 unsigned char sta_band = 0 , shortGIrate = false;
326326 unsigned int tx_ra_bitmap = 0 ;
327- struct mlme_priv * pmlmepriv = & ( padapter -> mlmepriv ) ;
327+ struct mlme_priv * pmlmepriv = & padapter -> mlmepriv ;
328328 struct wlan_bssid_ex
329329 * pcur_network = (struct wlan_bssid_ex * )& pmlmepriv -> cur_network .network ;
330330
@@ -372,9 +372,9 @@ void update_bmc_sta(struct adapter *padapter)
372372 unsigned char network_type ;
373373 int supportRateNum = 0 ;
374374 unsigned int tx_ra_bitmap = 0 ;
375- struct mlme_priv * pmlmepriv = & ( padapter -> mlmepriv ) ;
376- struct mlme_ext_priv * pmlmeext = & ( padapter -> mlmeextpriv ) ;
377- struct mlme_ext_info * pmlmeinfo = & ( pmlmeext -> mlmext_info ) ;
375+ struct mlme_priv * pmlmepriv = & padapter -> mlmepriv ;
376+ struct mlme_ext_priv * pmlmeext = & padapter -> mlmeextpriv ;
377+ struct mlme_ext_info * pmlmeinfo = & pmlmeext -> mlmext_info ;
378378 struct wlan_bssid_ex
379379 * pcur_network = (struct wlan_bssid_ex * )& pmlmepriv -> cur_network .network ;
380380 struct sta_info * psta = rtw_get_bcmc_stainfo (padapter );
@@ -451,9 +451,9 @@ void update_bmc_sta(struct adapter *padapter)
451451
452452void update_sta_info_apmode (struct adapter * padapter , struct sta_info * psta )
453453{
454- struct mlme_priv * pmlmepriv = & ( padapter -> mlmepriv ) ;
454+ struct mlme_priv * pmlmepriv = & padapter -> mlmepriv ;
455455 struct security_priv * psecuritypriv = & padapter -> securitypriv ;
456- struct mlme_ext_priv * pmlmeext = & ( padapter -> mlmeextpriv ) ;
456+ struct mlme_ext_priv * pmlmeext = & padapter -> mlmeextpriv ;
457457 struct ht_priv * phtpriv_ap = & pmlmepriv -> htpriv ;
458458 struct ht_priv * phtpriv_sta = & psta -> htpriv ;
459459 u8 cur_ldpc_cap = 0 , cur_stbc_cap = 0 , cur_beamform_cap = 0 ;
@@ -563,10 +563,10 @@ void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta)
563563
564564static void update_ap_info (struct adapter * padapter , struct sta_info * psta )
565565{
566- struct mlme_priv * pmlmepriv = & ( padapter -> mlmepriv ) ;
566+ struct mlme_priv * pmlmepriv = & padapter -> mlmepriv ;
567567 struct wlan_bssid_ex
568568 * pnetwork = (struct wlan_bssid_ex * )& pmlmepriv -> cur_network .network ;
569- struct mlme_ext_priv * pmlmeext = & ( padapter -> mlmeextpriv ) ;
569+ struct mlme_ext_priv * pmlmeext = & padapter -> mlmeextpriv ;
570570 struct ht_priv * phtpriv_ap = & pmlmepriv -> htpriv ;
571571
572572 psta -> wireless_mode = pmlmeext -> cur_wireless_mode ;
@@ -609,7 +609,7 @@ static void update_hw_ht_param(struct adapter *padapter)
609609 unsigned char max_AMPDU_len ;
610610 unsigned char min_MPDU_spacing ;
611611 struct mlme_ext_priv * pmlmeext = & padapter -> mlmeextpriv ;
612- struct mlme_ext_info * pmlmeinfo = & ( pmlmeext -> mlmext_info ) ;
612+ struct mlme_ext_info * pmlmeinfo = & pmlmeext -> mlmext_info ;
613613
614614 /* handle A-MPDU parameter field
615615 *
@@ -645,13 +645,13 @@ void start_bss_network(struct adapter *padapter)
645645 u32 acparm ;
646646 int ie_len ;
647647 struct registry_priv * pregpriv = & padapter -> registrypriv ;
648- struct mlme_priv * pmlmepriv = & ( padapter -> mlmepriv ) ;
649- struct security_priv * psecuritypriv = & ( padapter -> securitypriv ) ;
648+ struct mlme_priv * pmlmepriv = & padapter -> mlmepriv ;
649+ struct security_priv * psecuritypriv = & padapter -> securitypriv ;
650650 struct wlan_bssid_ex
651651 * pnetwork = (struct wlan_bssid_ex * )& pmlmepriv -> cur_network .network ;
652- struct mlme_ext_priv * pmlmeext = & ( padapter -> mlmeextpriv ) ;
653- struct mlme_ext_info * pmlmeinfo = & ( pmlmeext -> mlmext_info ) ;
654- struct wlan_bssid_ex * pnetwork_mlmeext = & ( pmlmeinfo -> network ) ;
652+ struct mlme_ext_priv * pmlmeext = & padapter -> mlmeextpriv ;
653+ struct mlme_ext_info * pmlmeinfo = & pmlmeext -> mlmext_info ;
654+ struct wlan_bssid_ex * pnetwork_mlmeext = & pmlmeinfo -> network ;
655655 struct HT_info_element * pht_info = NULL ;
656656 u8 cbw40_enable = 0 ;
657657
@@ -823,7 +823,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)
823823 u8 WMM_PARA_IE [] = {0x00 , 0x50 , 0xf2 , 0x02 , 0x01 , 0x01 };
824824 struct registry_priv * pregistrypriv = & padapter -> registrypriv ;
825825 struct security_priv * psecuritypriv = & padapter -> securitypriv ;
826- struct mlme_priv * pmlmepriv = & ( padapter -> mlmepriv ) ;
826+ struct mlme_priv * pmlmepriv = & padapter -> mlmepriv ;
827827 struct wlan_bssid_ex
828828 * pbss_network = (struct wlan_bssid_ex * )& pmlmepriv -> cur_network .network ;
829829 u8 * ie = pbss_network -> ies ;
@@ -845,7 +845,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)
845845
846846 pbss_network -> rssi = 0 ;
847847
848- memcpy (pbss_network -> mac_address , myid (& ( padapter -> eeprompriv ) ), ETH_ALEN );
848+ memcpy (pbss_network -> mac_address , myid (& padapter -> eeprompriv ), ETH_ALEN );
849849
850850 /* beacon interval */
851851 p = rtw_get_beacon_interval_from_ie (ie );/* ie + 8; 8: TimeStamp, 2: Beacon Interval 2:Capability */
@@ -1186,7 +1186,7 @@ int rtw_acl_add_sta(struct adapter *padapter, u8 *addr)
11861186 if ((NUM_ACL - 1 ) < pacl_list -> num )
11871187 return (-1 );
11881188
1189- spin_lock_bh (& ( pacl_node_q -> lock ) );
1189+ spin_lock_bh (& pacl_node_q -> lock );
11901190
11911191 phead = get_list_head (pacl_node_q );
11921192 list_for_each (plist , phead ) {
@@ -1200,12 +1200,12 @@ int rtw_acl_add_sta(struct adapter *padapter, u8 *addr)
12001200 }
12011201 }
12021202
1203- spin_unlock_bh (& ( pacl_node_q -> lock ) );
1203+ spin_unlock_bh (& pacl_node_q -> lock );
12041204
12051205 if (added )
12061206 return ret ;
12071207
1208- spin_lock_bh (& ( pacl_node_q -> lock ) );
1208+ spin_lock_bh (& pacl_node_q -> lock );
12091209
12101210 for (i = 0 ; i < NUM_ACL ; i ++ ) {
12111211 paclnode = & pacl_list -> aclnode [i ];
@@ -1225,7 +1225,7 @@ int rtw_acl_add_sta(struct adapter *padapter, u8 *addr)
12251225 }
12261226 }
12271227
1228- spin_unlock_bh (& ( pacl_node_q -> lock ) );
1228+ spin_unlock_bh (& pacl_node_q -> lock );
12291229
12301230 return ret ;
12311231}
@@ -1238,7 +1238,7 @@ void rtw_acl_remove_sta(struct adapter *padapter, u8 *addr)
12381238 struct wlan_acl_pool * pacl_list = & pstapriv -> acl_list ;
12391239 struct __queue * pacl_node_q = & pacl_list -> acl_node_q ;
12401240
1241- spin_lock_bh (& ( pacl_node_q -> lock ) );
1241+ spin_lock_bh (& pacl_node_q -> lock );
12421242
12431243 phead = get_list_head (pacl_node_q );
12441244 list_for_each_safe (plist , tmp , phead ) {
@@ -1258,7 +1258,7 @@ void rtw_acl_remove_sta(struct adapter *padapter, u8 *addr)
12581258 }
12591259 }
12601260
1261- spin_unlock_bh (& ( pacl_node_q -> lock ) );
1261+ spin_unlock_bh (& pacl_node_q -> lock );
12621262
12631263}
12641264
@@ -1308,7 +1308,7 @@ static int rtw_ap_set_key(
13081308 u8 keylen ;
13091309 struct cmd_obj * pcmd ;
13101310 struct setkey_parm * psetkeyparm ;
1311- struct cmd_priv * pcmdpriv = & ( padapter -> cmdpriv ) ;
1311+ struct cmd_priv * pcmdpriv = & padapter -> cmdpriv ;
13121312 int res = _SUCCESS ;
13131313
13141314 pcmd = rtw_zmalloc (sizeof (struct cmd_obj ));
@@ -1345,7 +1345,7 @@ static int rtw_ap_set_key(
13451345 keylen = 16 ;
13461346 }
13471347
1348- memcpy (& ( psetkeyparm -> key [0 ]) , key , keylen );
1348+ memcpy (& psetkeyparm -> key [0 ], key , keylen );
13491349
13501350 pcmd -> cmdcode = _SetKey_CMD_ ;
13511351 pcmd -> parmbuf = (u8 * )psetkeyparm ;
@@ -1397,10 +1397,10 @@ static void update_bcn_fixed_ie(struct adapter *padapter)
13971397
13981398static void update_bcn_erpinfo_ie (struct adapter * padapter )
13991399{
1400- struct mlme_priv * pmlmepriv = & ( padapter -> mlmepriv ) ;
1401- struct mlme_ext_priv * pmlmeext = & ( padapter -> mlmeextpriv ) ;
1402- struct mlme_ext_info * pmlmeinfo = & ( pmlmeext -> mlmext_info ) ;
1403- struct wlan_bssid_ex * pnetwork = & ( pmlmeinfo -> network ) ;
1400+ struct mlme_priv * pmlmepriv = & padapter -> mlmepriv ;
1401+ struct mlme_ext_priv * pmlmeext = & padapter -> mlmeextpriv ;
1402+ struct mlme_ext_info * pmlmeinfo = & pmlmeext -> mlmext_info ;
1403+ struct wlan_bssid_ex * pnetwork = & pmlmeinfo -> network ;
14041404 unsigned char * p , * ie = pnetwork -> ies ;
14051405 u32 len = 0 ;
14061406
@@ -1461,10 +1461,10 @@ static void update_bcn_wps_ie(struct adapter *padapter)
14611461 u8 * pbackup_remainder_ie = NULL ;
14621462
14631463 uint wps_ielen = 0 , wps_offset , remainder_ielen ;
1464- struct mlme_priv * pmlmepriv = & ( padapter -> mlmepriv ) ;
1465- struct mlme_ext_priv * pmlmeext = & ( padapter -> mlmeextpriv ) ;
1466- struct mlme_ext_info * pmlmeinfo = & ( pmlmeext -> mlmext_info ) ;
1467- struct wlan_bssid_ex * pnetwork = & ( pmlmeinfo -> network ) ;
1464+ struct mlme_priv * pmlmepriv = & padapter -> mlmepriv ;
1465+ struct mlme_ext_priv * pmlmeext = & padapter -> mlmeextpriv ;
1466+ struct mlme_ext_info * pmlmeinfo = & pmlmeext -> mlmext_info ;
1467+ struct wlan_bssid_ex * pnetwork = & pmlmeinfo -> network ;
14681468 unsigned char * ie = pnetwork -> ies ;
14691469 u32 ielen = pnetwork -> ie_length ;
14701470
@@ -1537,8 +1537,8 @@ void update_beacon(struct adapter *padapter, u8 ie_id, u8 *oui, u8 tx)
15371537 if (!padapter )
15381538 return ;
15391539
1540- pmlmepriv = & ( padapter -> mlmepriv ) ;
1541- pmlmeext = & ( padapter -> mlmeextpriv ) ;
1540+ pmlmepriv = & padapter -> mlmepriv ;
1541+ pmlmeext = & padapter -> mlmeextpriv ;
15421542 /* pmlmeinfo = &(pmlmeext->mlmext_info); */
15431543
15441544 if (!pmlmeext -> bstart_bss )
@@ -1619,7 +1619,7 @@ static int rtw_ht_operation_update(struct adapter *padapter)
16191619{
16201620 u16 cur_op_mode , new_op_mode ;
16211621 int op_mode_changes = 0 ;
1622- struct mlme_priv * pmlmepriv = & ( padapter -> mlmepriv ) ;
1622+ struct mlme_priv * pmlmepriv = & padapter -> mlmepriv ;
16231623 struct ht_priv * phtpriv_ap = & pmlmepriv -> htpriv ;
16241624
16251625 if (pmlmepriv -> htpriv .ht_option )
@@ -1703,8 +1703,8 @@ void associated_clients_update(struct adapter *padapter, u8 updated)
17031703void bss_cap_update_on_sta_join (struct adapter * padapter , struct sta_info * psta )
17041704{
17051705 u8 beacon_updated = false;
1706- struct mlme_priv * pmlmepriv = & ( padapter -> mlmepriv ) ;
1707- struct mlme_ext_priv * pmlmeext = & ( padapter -> mlmeextpriv ) ;
1706+ struct mlme_priv * pmlmepriv = & padapter -> mlmepriv ;
1707+ struct mlme_ext_priv * pmlmeext = & padapter -> mlmeextpriv ;
17081708
17091709 if (!(psta -> flags & WLAN_STA_SHORT_PREAMBLE )) {
17101710 if (!psta -> no_short_preamble_set ) {
@@ -1823,8 +1823,8 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta)
18231823u8 bss_cap_update_on_sta_leave (struct adapter * padapter , struct sta_info * psta )
18241824{
18251825 u8 beacon_updated = false;
1826- struct mlme_priv * pmlmepriv = & ( padapter -> mlmepriv ) ;
1827- struct mlme_ext_priv * pmlmeext = & ( padapter -> mlmeextpriv ) ;
1826+ struct mlme_priv * pmlmepriv = & padapter -> mlmepriv ;
1827+ struct mlme_ext_priv * pmlmeext = & padapter -> mlmeextpriv ;
18281828
18291829 if (!psta )
18301830 return beacon_updated ;
@@ -1932,7 +1932,7 @@ void rtw_sta_flush(struct adapter *padapter)
19321932 struct sta_info * psta = NULL ;
19331933 struct sta_priv * pstapriv = & padapter -> stapriv ;
19341934 struct mlme_ext_priv * pmlmeext = & padapter -> mlmeextpriv ;
1935- struct mlme_ext_info * pmlmeinfo = & ( pmlmeext -> mlmext_info ) ;
1935+ struct mlme_ext_info * pmlmeinfo = & pmlmeext -> mlmext_info ;
19361936 u8 bc_addr [ETH_ALEN ] = {0xff , 0xff , 0xff , 0xff , 0xff , 0xff };
19371937
19381938 if ((pmlmeinfo -> state & 0x03 ) != WIFI_FW_AP_STATE )
@@ -1962,7 +1962,7 @@ void rtw_sta_flush(struct adapter *padapter)
19621962void sta_info_update (struct adapter * padapter , struct sta_info * psta )
19631963{
19641964 int flags = psta -> flags ;
1965- struct mlme_priv * pmlmepriv = & ( padapter -> mlmepriv ) ;
1965+ struct mlme_priv * pmlmepriv = & padapter -> mlmepriv ;
19661966
19671967 /* update wmm cap. */
19681968 if (WLAN_STA_WME & flags )
@@ -1991,7 +1991,7 @@ void sta_info_update(struct adapter *padapter, struct sta_info *psta)
19911991void ap_sta_info_defer_update (struct adapter * padapter , struct sta_info * psta )
19921992{
19931993 struct mlme_ext_priv * pmlmeext = & padapter -> mlmeextpriv ;
1994- struct mlme_ext_info * pmlmeinfo = & ( pmlmeext -> mlmext_info ) ;
1994+ struct mlme_ext_info * pmlmeinfo = & pmlmeext -> mlmext_info ;
19951995
19961996 if (psta -> state & _FW_LINKED ) {
19971997 pmlmeinfo -> FW_sta_info [psta -> mac_id ].psta = psta ;
@@ -2006,7 +2006,7 @@ void rtw_ap_restore_network(struct adapter *padapter)
20062006 struct mlme_ext_priv * pmlmeext = & padapter -> mlmeextpriv ;
20072007 struct sta_priv * pstapriv = & padapter -> stapriv ;
20082008 struct sta_info * psta ;
2009- struct security_priv * psecuritypriv = & ( padapter -> securitypriv ) ;
2009+ struct security_priv * psecuritypriv = & padapter -> securitypriv ;
20102010 struct list_head * phead , * plist ;
20112011 u8 chk_alive_num = 0 ;
20122012 char chk_alive_list [NUM_STA ];
@@ -2072,7 +2072,7 @@ void rtw_ap_restore_network(struct adapter *padapter)
20722072void start_ap_mode (struct adapter * padapter )
20732073{
20742074 int i ;
2075- struct mlme_priv * pmlmepriv = & ( padapter -> mlmepriv ) ;
2075+ struct mlme_priv * pmlmepriv = & padapter -> mlmepriv ;
20762076 struct sta_priv * pstapriv = & padapter -> stapriv ;
20772077 struct mlme_ext_priv * pmlmeext = & padapter -> mlmeextpriv ;
20782078 struct wlan_acl_pool * pacl_list = & pstapriv -> acl_list ;
@@ -2109,7 +2109,7 @@ void start_ap_mode(struct adapter *padapter)
21092109 pmlmepriv -> p2p_probe_resp_ie = NULL ;
21102110
21112111 /* for ACL */
2112- INIT_LIST_HEAD (& ( pacl_list -> acl_node_q .queue ) );
2112+ INIT_LIST_HEAD (& pacl_list -> acl_node_q .queue );
21132113 pacl_list -> num = 0 ;
21142114 pacl_list -> mode = 0 ;
21152115 for (i = 0 ; i < NUM_ACL ; i ++ ) {
@@ -2124,7 +2124,7 @@ void stop_ap_mode(struct adapter *padapter)
21242124 struct rtw_wlan_acl_node * paclnode ;
21252125 struct sta_info * psta = NULL ;
21262126 struct sta_priv * pstapriv = & padapter -> stapriv ;
2127- struct mlme_priv * pmlmepriv = & ( padapter -> mlmepriv ) ;
2127+ struct mlme_priv * pmlmepriv = & padapter -> mlmepriv ;
21282128 struct mlme_ext_priv * pmlmeext = & padapter -> mlmeextpriv ;
21292129 struct wlan_acl_pool * pacl_list = & pstapriv -> acl_list ;
21302130 struct __queue * pacl_node_q = & pacl_list -> acl_node_q ;
@@ -2142,7 +2142,7 @@ void stop_ap_mode(struct adapter *padapter)
21422142 padapter -> securitypriv .ndisencryptstatus = Ndis802_11WEPDisabled ;
21432143
21442144 /* for ACL */
2145- spin_lock_bh (& ( pacl_node_q -> lock ) );
2145+ spin_lock_bh (& pacl_node_q -> lock );
21462146 phead = get_list_head (pacl_node_q );
21472147 list_for_each_safe (plist , tmp , phead ) {
21482148 paclnode = list_entry (plist , struct rtw_wlan_acl_node , list );
@@ -2155,7 +2155,7 @@ void stop_ap_mode(struct adapter *padapter)
21552155 pacl_list -> num -- ;
21562156 }
21572157 }
2158- spin_unlock_bh (& ( pacl_node_q -> lock ) );
2158+ spin_unlock_bh (& pacl_node_q -> lock );
21592159
21602160 rtw_sta_flush (padapter );
21612161
0 commit comments