@@ -324,7 +324,7 @@ void add_RATid(struct adapter *padapter, struct sta_info *psta, u8 rssi_level)
324
324
{
325
325
unsigned char sta_band = 0 , shortGIrate = false;
326
326
unsigned int tx_ra_bitmap = 0 ;
327
- struct mlme_priv * pmlmepriv = & ( padapter -> mlmepriv ) ;
327
+ struct mlme_priv * pmlmepriv = & padapter -> mlmepriv ;
328
328
struct wlan_bssid_ex
329
329
* pcur_network = (struct wlan_bssid_ex * )& pmlmepriv -> cur_network .network ;
330
330
@@ -372,9 +372,9 @@ void update_bmc_sta(struct adapter *padapter)
372
372
unsigned char network_type ;
373
373
int supportRateNum = 0 ;
374
374
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 ;
378
378
struct wlan_bssid_ex
379
379
* pcur_network = (struct wlan_bssid_ex * )& pmlmepriv -> cur_network .network ;
380
380
struct sta_info * psta = rtw_get_bcmc_stainfo (padapter );
@@ -451,9 +451,9 @@ void update_bmc_sta(struct adapter *padapter)
451
451
452
452
void update_sta_info_apmode (struct adapter * padapter , struct sta_info * psta )
453
453
{
454
- struct mlme_priv * pmlmepriv = & ( padapter -> mlmepriv ) ;
454
+ struct mlme_priv * pmlmepriv = & padapter -> mlmepriv ;
455
455
struct security_priv * psecuritypriv = & padapter -> securitypriv ;
456
- struct mlme_ext_priv * pmlmeext = & ( padapter -> mlmeextpriv ) ;
456
+ struct mlme_ext_priv * pmlmeext = & padapter -> mlmeextpriv ;
457
457
struct ht_priv * phtpriv_ap = & pmlmepriv -> htpriv ;
458
458
struct ht_priv * phtpriv_sta = & psta -> htpriv ;
459
459
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)
563
563
564
564
static void update_ap_info (struct adapter * padapter , struct sta_info * psta )
565
565
{
566
- struct mlme_priv * pmlmepriv = & ( padapter -> mlmepriv ) ;
566
+ struct mlme_priv * pmlmepriv = & padapter -> mlmepriv ;
567
567
struct wlan_bssid_ex
568
568
* 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 ;
570
570
struct ht_priv * phtpriv_ap = & pmlmepriv -> htpriv ;
571
571
572
572
psta -> wireless_mode = pmlmeext -> cur_wireless_mode ;
@@ -609,7 +609,7 @@ static void update_hw_ht_param(struct adapter *padapter)
609
609
unsigned char max_AMPDU_len ;
610
610
unsigned char min_MPDU_spacing ;
611
611
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 ;
613
613
614
614
/* handle A-MPDU parameter field
615
615
*
@@ -645,13 +645,13 @@ void start_bss_network(struct adapter *padapter)
645
645
u32 acparm ;
646
646
int ie_len ;
647
647
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 ;
650
650
struct wlan_bssid_ex
651
651
* 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 ;
655
655
struct HT_info_element * pht_info = NULL ;
656
656
u8 cbw40_enable = 0 ;
657
657
@@ -823,7 +823,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)
823
823
u8 WMM_PARA_IE [] = {0x00 , 0x50 , 0xf2 , 0x02 , 0x01 , 0x01 };
824
824
struct registry_priv * pregistrypriv = & padapter -> registrypriv ;
825
825
struct security_priv * psecuritypriv = & padapter -> securitypriv ;
826
- struct mlme_priv * pmlmepriv = & ( padapter -> mlmepriv ) ;
826
+ struct mlme_priv * pmlmepriv = & padapter -> mlmepriv ;
827
827
struct wlan_bssid_ex
828
828
* pbss_network = (struct wlan_bssid_ex * )& pmlmepriv -> cur_network .network ;
829
829
u8 * ie = pbss_network -> ies ;
@@ -845,7 +845,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)
845
845
846
846
pbss_network -> rssi = 0 ;
847
847
848
- memcpy (pbss_network -> mac_address , myid (& ( padapter -> eeprompriv ) ), ETH_ALEN );
848
+ memcpy (pbss_network -> mac_address , myid (& padapter -> eeprompriv ), ETH_ALEN );
849
849
850
850
/* beacon interval */
851
851
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)
1186
1186
if ((NUM_ACL - 1 ) < pacl_list -> num )
1187
1187
return (-1 );
1188
1188
1189
- spin_lock_bh (& ( pacl_node_q -> lock ) );
1189
+ spin_lock_bh (& pacl_node_q -> lock );
1190
1190
1191
1191
phead = get_list_head (pacl_node_q );
1192
1192
list_for_each (plist , phead ) {
@@ -1200,12 +1200,12 @@ int rtw_acl_add_sta(struct adapter *padapter, u8 *addr)
1200
1200
}
1201
1201
}
1202
1202
1203
- spin_unlock_bh (& ( pacl_node_q -> lock ) );
1203
+ spin_unlock_bh (& pacl_node_q -> lock );
1204
1204
1205
1205
if (added )
1206
1206
return ret ;
1207
1207
1208
- spin_lock_bh (& ( pacl_node_q -> lock ) );
1208
+ spin_lock_bh (& pacl_node_q -> lock );
1209
1209
1210
1210
for (i = 0 ; i < NUM_ACL ; i ++ ) {
1211
1211
paclnode = & pacl_list -> aclnode [i ];
@@ -1225,7 +1225,7 @@ int rtw_acl_add_sta(struct adapter *padapter, u8 *addr)
1225
1225
}
1226
1226
}
1227
1227
1228
- spin_unlock_bh (& ( pacl_node_q -> lock ) );
1228
+ spin_unlock_bh (& pacl_node_q -> lock );
1229
1229
1230
1230
return ret ;
1231
1231
}
@@ -1238,7 +1238,7 @@ void rtw_acl_remove_sta(struct adapter *padapter, u8 *addr)
1238
1238
struct wlan_acl_pool * pacl_list = & pstapriv -> acl_list ;
1239
1239
struct __queue * pacl_node_q = & pacl_list -> acl_node_q ;
1240
1240
1241
- spin_lock_bh (& ( pacl_node_q -> lock ) );
1241
+ spin_lock_bh (& pacl_node_q -> lock );
1242
1242
1243
1243
phead = get_list_head (pacl_node_q );
1244
1244
list_for_each_safe (plist , tmp , phead ) {
@@ -1258,7 +1258,7 @@ void rtw_acl_remove_sta(struct adapter *padapter, u8 *addr)
1258
1258
}
1259
1259
}
1260
1260
1261
- spin_unlock_bh (& ( pacl_node_q -> lock ) );
1261
+ spin_unlock_bh (& pacl_node_q -> lock );
1262
1262
1263
1263
}
1264
1264
@@ -1308,7 +1308,7 @@ static int rtw_ap_set_key(
1308
1308
u8 keylen ;
1309
1309
struct cmd_obj * pcmd ;
1310
1310
struct setkey_parm * psetkeyparm ;
1311
- struct cmd_priv * pcmdpriv = & ( padapter -> cmdpriv ) ;
1311
+ struct cmd_priv * pcmdpriv = & padapter -> cmdpriv ;
1312
1312
int res = _SUCCESS ;
1313
1313
1314
1314
pcmd = rtw_zmalloc (sizeof (struct cmd_obj ));
@@ -1345,7 +1345,7 @@ static int rtw_ap_set_key(
1345
1345
keylen = 16 ;
1346
1346
}
1347
1347
1348
- memcpy (& ( psetkeyparm -> key [0 ]) , key , keylen );
1348
+ memcpy (& psetkeyparm -> key [0 ], key , keylen );
1349
1349
1350
1350
pcmd -> cmdcode = _SetKey_CMD_ ;
1351
1351
pcmd -> parmbuf = (u8 * )psetkeyparm ;
@@ -1397,10 +1397,10 @@ static void update_bcn_fixed_ie(struct adapter *padapter)
1397
1397
1398
1398
static void update_bcn_erpinfo_ie (struct adapter * padapter )
1399
1399
{
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 ;
1404
1404
unsigned char * p , * ie = pnetwork -> ies ;
1405
1405
u32 len = 0 ;
1406
1406
@@ -1461,10 +1461,10 @@ static void update_bcn_wps_ie(struct adapter *padapter)
1461
1461
u8 * pbackup_remainder_ie = NULL ;
1462
1462
1463
1463
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 ;
1468
1468
unsigned char * ie = pnetwork -> ies ;
1469
1469
u32 ielen = pnetwork -> ie_length ;
1470
1470
@@ -1537,8 +1537,8 @@ void update_beacon(struct adapter *padapter, u8 ie_id, u8 *oui, u8 tx)
1537
1537
if (!padapter )
1538
1538
return ;
1539
1539
1540
- pmlmepriv = & ( padapter -> mlmepriv ) ;
1541
- pmlmeext = & ( padapter -> mlmeextpriv ) ;
1540
+ pmlmepriv = & padapter -> mlmepriv ;
1541
+ pmlmeext = & padapter -> mlmeextpriv ;
1542
1542
/* pmlmeinfo = &(pmlmeext->mlmext_info); */
1543
1543
1544
1544
if (!pmlmeext -> bstart_bss )
@@ -1619,7 +1619,7 @@ static int rtw_ht_operation_update(struct adapter *padapter)
1619
1619
{
1620
1620
u16 cur_op_mode , new_op_mode ;
1621
1621
int op_mode_changes = 0 ;
1622
- struct mlme_priv * pmlmepriv = & ( padapter -> mlmepriv ) ;
1622
+ struct mlme_priv * pmlmepriv = & padapter -> mlmepriv ;
1623
1623
struct ht_priv * phtpriv_ap = & pmlmepriv -> htpriv ;
1624
1624
1625
1625
if (pmlmepriv -> htpriv .ht_option )
@@ -1703,8 +1703,8 @@ void associated_clients_update(struct adapter *padapter, u8 updated)
1703
1703
void bss_cap_update_on_sta_join (struct adapter * padapter , struct sta_info * psta )
1704
1704
{
1705
1705
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 ;
1708
1708
1709
1709
if (!(psta -> flags & WLAN_STA_SHORT_PREAMBLE )) {
1710
1710
if (!psta -> no_short_preamble_set ) {
@@ -1823,8 +1823,8 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta)
1823
1823
u8 bss_cap_update_on_sta_leave (struct adapter * padapter , struct sta_info * psta )
1824
1824
{
1825
1825
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 ;
1828
1828
1829
1829
if (!psta )
1830
1830
return beacon_updated ;
@@ -1932,7 +1932,7 @@ void rtw_sta_flush(struct adapter *padapter)
1932
1932
struct sta_info * psta = NULL ;
1933
1933
struct sta_priv * pstapriv = & padapter -> stapriv ;
1934
1934
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 ;
1936
1936
u8 bc_addr [ETH_ALEN ] = {0xff , 0xff , 0xff , 0xff , 0xff , 0xff };
1937
1937
1938
1938
if ((pmlmeinfo -> state & 0x03 ) != WIFI_FW_AP_STATE )
@@ -1962,7 +1962,7 @@ void rtw_sta_flush(struct adapter *padapter)
1962
1962
void sta_info_update (struct adapter * padapter , struct sta_info * psta )
1963
1963
{
1964
1964
int flags = psta -> flags ;
1965
- struct mlme_priv * pmlmepriv = & ( padapter -> mlmepriv ) ;
1965
+ struct mlme_priv * pmlmepriv = & padapter -> mlmepriv ;
1966
1966
1967
1967
/* update wmm cap. */
1968
1968
if (WLAN_STA_WME & flags )
@@ -1991,7 +1991,7 @@ void sta_info_update(struct adapter *padapter, struct sta_info *psta)
1991
1991
void ap_sta_info_defer_update (struct adapter * padapter , struct sta_info * psta )
1992
1992
{
1993
1993
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 ;
1995
1995
1996
1996
if (psta -> state & _FW_LINKED ) {
1997
1997
pmlmeinfo -> FW_sta_info [psta -> mac_id ].psta = psta ;
@@ -2006,7 +2006,7 @@ void rtw_ap_restore_network(struct adapter *padapter)
2006
2006
struct mlme_ext_priv * pmlmeext = & padapter -> mlmeextpriv ;
2007
2007
struct sta_priv * pstapriv = & padapter -> stapriv ;
2008
2008
struct sta_info * psta ;
2009
- struct security_priv * psecuritypriv = & ( padapter -> securitypriv ) ;
2009
+ struct security_priv * psecuritypriv = & padapter -> securitypriv ;
2010
2010
struct list_head * phead , * plist ;
2011
2011
u8 chk_alive_num = 0 ;
2012
2012
char chk_alive_list [NUM_STA ];
@@ -2072,7 +2072,7 @@ void rtw_ap_restore_network(struct adapter *padapter)
2072
2072
void start_ap_mode (struct adapter * padapter )
2073
2073
{
2074
2074
int i ;
2075
- struct mlme_priv * pmlmepriv = & ( padapter -> mlmepriv ) ;
2075
+ struct mlme_priv * pmlmepriv = & padapter -> mlmepriv ;
2076
2076
struct sta_priv * pstapriv = & padapter -> stapriv ;
2077
2077
struct mlme_ext_priv * pmlmeext = & padapter -> mlmeextpriv ;
2078
2078
struct wlan_acl_pool * pacl_list = & pstapriv -> acl_list ;
@@ -2109,7 +2109,7 @@ void start_ap_mode(struct adapter *padapter)
2109
2109
pmlmepriv -> p2p_probe_resp_ie = NULL ;
2110
2110
2111
2111
/* for ACL */
2112
- INIT_LIST_HEAD (& ( pacl_list -> acl_node_q .queue ) );
2112
+ INIT_LIST_HEAD (& pacl_list -> acl_node_q .queue );
2113
2113
pacl_list -> num = 0 ;
2114
2114
pacl_list -> mode = 0 ;
2115
2115
for (i = 0 ; i < NUM_ACL ; i ++ ) {
@@ -2124,7 +2124,7 @@ void stop_ap_mode(struct adapter *padapter)
2124
2124
struct rtw_wlan_acl_node * paclnode ;
2125
2125
struct sta_info * psta = NULL ;
2126
2126
struct sta_priv * pstapriv = & padapter -> stapriv ;
2127
- struct mlme_priv * pmlmepriv = & ( padapter -> mlmepriv ) ;
2127
+ struct mlme_priv * pmlmepriv = & padapter -> mlmepriv ;
2128
2128
struct mlme_ext_priv * pmlmeext = & padapter -> mlmeextpriv ;
2129
2129
struct wlan_acl_pool * pacl_list = & pstapriv -> acl_list ;
2130
2130
struct __queue * pacl_node_q = & pacl_list -> acl_node_q ;
@@ -2142,7 +2142,7 @@ void stop_ap_mode(struct adapter *padapter)
2142
2142
padapter -> securitypriv .ndisencryptstatus = Ndis802_11WEPDisabled ;
2143
2143
2144
2144
/* for ACL */
2145
- spin_lock_bh (& ( pacl_node_q -> lock ) );
2145
+ spin_lock_bh (& pacl_node_q -> lock );
2146
2146
phead = get_list_head (pacl_node_q );
2147
2147
list_for_each_safe (plist , tmp , phead ) {
2148
2148
paclnode = list_entry (plist , struct rtw_wlan_acl_node , list );
@@ -2155,7 +2155,7 @@ void stop_ap_mode(struct adapter *padapter)
2155
2155
pacl_list -> num -- ;
2156
2156
}
2157
2157
}
2158
- spin_unlock_bh (& ( pacl_node_q -> lock ) );
2158
+ spin_unlock_bh (& pacl_node_q -> lock );
2159
2159
2160
2160
rtw_sta_flush (padapter );
2161
2161
0 commit comments