staging: r8188eu: remove unnecessary parentheses
cover staging: r8188eu: remove unnecessary parentheses
This series removes unnecessary parentheses reported by checkpatch.
Michael Straube (17):
staging: r8188eu: remove unnecessary parentheses in os_dep dir
staging: r8188eu: remove unnecessary parentheses in hal dir
staging: r8188eu: remove unnecessary parentheses in
core/rtw_mlme_ext.c
staging: r8188eu: remove unnecessary parentheses in core/rtw_ap.c
staging: r8188eu: remove unnecessary parentheses in
core/rtw_wlan_util.c
staging: r8188eu: remove unnecessary parentheses in core/rtw_led.c
staging: r8188eu: remove unnecessary parentheses in core/rtw_p2p.c
staging: r8188eu: clean up comparsions to true/false
staging: r8188eu: remove unnecessary parentheses in core/rtw_mlme.c
staging: r8188eu: remove unnecessary parentheses in core/rtw_xmit.c
staging: r8188eu: remove unnecessary parentheses in core/rtw_sta_mgt.c
staging: r8188eu: remove unnecessary parentheses in core/rtw_recv.c
staging: r8188eu: remove unnecessary parentheses in core/rtw_pwrctrl.c
staging: r8188eu: remove unnecessary parentheses in core/rtw_io.c
staging: r8188eu: remove unnecessary parentheses in
core/rtw_ioctl_set.c
staging: r8188eu: remove unnecessary parentheses in core/rtw_cmd.c
staging: r8188eu: remove remaining unnecessary parentheses in core dir
drivers/staging/r8188eu/core/rtw_ap.c | 80 +-- drivers/staging/r8188eu/core/rtw_br_ext.c | 6 +- drivers/staging/r8188eu/core/rtw_cmd.c | 36 +- drivers/staging/r8188eu/core/rtw_debug.c | 14 +- drivers/staging/r8188eu/core/rtw_ieee80211.c | 4 +- drivers/staging/r8188eu/core/rtw_io.c | 32 +- drivers/staging/r8188eu/core/rtw_ioctl_set.c | 22 +- drivers/staging/r8188eu/core/rtw_iol.c | 2 +- drivers/staging/r8188eu/core/rtw_led.c | 354 +++++------ drivers/staging/r8188eu/core/rtw_mlme.c | 110 ++-- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 586 +++++++++--------- drivers/staging/r8188eu/core/rtw_mp.c | 10 +- drivers/staging/r8188eu/core/rtw_p2p.c | 78 +-- drivers/staging/r8188eu/core/rtw_pwrctrl.c | 20 +- drivers/staging/r8188eu/core/rtw_recv.c | 26 +- drivers/staging/r8188eu/core/rtw_sta_mgt.c | 22 +- drivers/staging/r8188eu/core/rtw_wlan_util.c | 70 +-- drivers/staging/r8188eu/core/rtw_xmit.c | 56 +- .../r8188eu/hal/Hal8188ERateAdaptive.c | 8 +- drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 16 +- drivers/staging/r8188eu/hal/hal_intf.c | 2 +- drivers/staging/r8188eu/hal/odm.c | 44 +- drivers/staging/r8188eu/hal/odm_RTL8188E.c | 10 +- drivers/staging/r8188eu/hal/rtl8188e_cmd.c | 56 +- drivers/staging/r8188eu/hal/rtl8188e_dm.c | 30 +- drivers/staging/r8188eu/hal/rtl8188e_mp.c | 8 +- drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 2 +- drivers/staging/r8188eu/hal/rtl8188eu_led.c | 12 +- drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 10 +- drivers/staging/r8188eu/hal/usb_halinit.c | 32 +- drivers/staging/r8188eu/hal/usb_ops_linux.c | 6 +- drivers/staging/r8188eu/os_dep/ioctl_linux.c | 162 ++--- drivers/staging/r8188eu/os_dep/os_intfs.c | 4 +- .../staging/r8188eu/os_dep/osdep_service.c | 4 +- drivers/staging/r8188eu/os_dep/recv_linux.c | 4 +- drivers/staging/r8188eu/os_dep/rtw_android.c | 2 +- drivers/staging/r8188eu/os_dep/usb_intf.c | 2 +- 37 files changed, 971 insertions(+), 971 deletions(-)
Signature · 1 line
2.32.0
PATCH 1/17 staging: r8188eu: remove unnecessary parentheses in os_dep dir
Remove unnecessary parentheses in the os_dep directory reported by checkpatch.
--- drivers/staging/r8188eu/os_dep/ioctl_linux.c | 162 +++++++++--------- drivers/staging/r8188eu/os_dep/os_intfs.c | 4 +- .../staging/r8188eu/os_dep/osdep_service.c | 4 +- drivers/staging/r8188eu/os_dep/recv_linux.c | 4 +- drivers/staging/r8188eu/os_dep/rtw_android.c | 2 +- drivers/staging/r8188eu/os_dep/usb_intf.c | 2 +- 6 files changed, 89 insertions(+), 89 deletions(-)
drivers/staging/r8188eu/os_dep/ioctl_linux.c +81 -81
@@ -168,7 +168,7 @@ static char *translate_scan(struct adapter *padapter,struct wlan_network *pnetwork, char *start, char *stop) { - struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); + struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct iw_event iwe;u16 cap;__le16 le_tmp;
@@ -551,7 +551,7 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param, ret = -EOPNOTSUPP ; goto exit; } -memcpy (&(psecuritypriv->dot11DefKey[wep_key_idx].skey[0 ]), pwep->KeyMaterial, pwep->KeyLength); +memcpy (&psecuritypriv->dot11DefKey[wep_key_idx].skey[0 ], pwep->KeyMaterial, pwep->KeyLength); psecuritypriv->dot11DefKeylen[wep_key_idx] = pwep->KeyLength;rtw_set_key (padapter, psecuritypriv, wep_key_idx,0 ); }
@@ -578,8 +578,8 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param,memcpy (psta->dot118021x_UncstKey.skey, param->u.crypt.key, (param->u.crypt.key_len >16 ?16 : param->u.crypt.key_len));if (strcmp (param->u.crypt.alg,"TKIP" ) ==0 ) {/* set mic key */ -memcpy (psta->dot11tkiptxmickey.skey, &(param->u.crypt.key[16 ]),8 ); -memcpy (psta->dot11tkiprxmickey.skey, &(param->u.crypt.key[24 ]),8 ); +memcpy (psta->dot11tkiptxmickey.skey, ¶m->u.crypt.key[16 ],8 ); +memcpy (psta->dot11tkiprxmickey.skey, ¶m->u.crypt.key[24 ],8 ); padapter->securitypriv.busetkipkey = false; }
@@ -588,8 +588,8 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param,rtw_setstakey_cmd (padapter, (unsigned char *)psta, true); }else {/* group key */ memcpy (padapter->securitypriv.dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key, (param->u.crypt.key_len >16 ?16 : param->u.crypt.key_len)); -memcpy (padapter->securitypriv.dot118021XGrptxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[16 ]),8 ); -memcpy (padapter->securitypriv.dot118021XGrprxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[24 ]),8 ); +memcpy (padapter->securitypriv.dot118021XGrptxmickey[param->u.crypt.idx].skey, ¶m->u.crypt.key[16 ],8 ); +memcpy (padapter->securitypriv.dot118021XGrprxmickey[param->u.crypt.idx].skey, ¶m->u.crypt.key[24 ],8 ); padapter->securitypriv.binstallGrpkey = true;DBG_88E (" ~~~~set sta key:groupkey\n" );
@@ -768,7 +768,7 @@ static int rtw_wx_get_name(struct net_device *dev,u32 ht_ielen =0 ;char *p;u8 ht_cap = false; -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network;NDIS_802_11_RATES_EX *prates =NULL ;
@@ -834,7 +834,7 @@ static int rtw_wx_get_freq(struct net_device *dev, union iwreq_data *wrqu, char *extra) { struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network;if (check_fwstate (pmlmepriv, _FW_LINKED)) {
@@ -906,7 +906,7 @@ static int rtw_wx_get_mode(struct net_device *dev, struct iw_request_info *a, union iwreq_data *wrqu, char *b) { struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, (" rtw_wx_get_mode\n" ));
@@ -1115,10 +1115,10 @@ static int rtw_wx_set_wap(struct net_device *dev,uint ret =0 ;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev);struct sockaddr *temp = (struct sockaddr *)awrq; -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct list_head *phead;u8 *dst_bssid, *src_bssid; -struct __queue *queue = &(pmlmepriv->scanned_queue); +struct __queue *queue = &pmlmepriv->scanned_queue;struct wlan_network *pnetwork =NULL ;enum ndis_802_11_auth_mode authmode;
@@ -1185,7 +1185,7 @@ static int rtw_wx_get_wap(struct net_device *dev, union iwreq_data *wrqu, char *extra) { struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network; wrqu->ap_addr.sa_family =ARPHRD_ETHER ;
@@ -1250,7 +1250,7 @@ static int rtw_wx_set_scan(struct net_device *dev, struct iw_request_info *a,struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct ndis_802_11_ssid ssid[RTW_SSID_SCAN_AMOUNT ];#ifdef CONFIG_88EU_P2P -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct wifidirect_info *pwdinfo = &padapter->wdinfo;#endif /* CONFIG_88EU_P2P */ RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("rtw_wx_set_scan\n" ));
@@ -1392,8 +1392,8 @@ static int rtw_wx_get_scan(struct net_device *dev, struct iw_request_info *a, {struct list_head *plist, *phead;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -struct __queue *queue = &(pmlmepriv->scanned_queue); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +struct __queue *queue = &pmlmepriv->scanned_queue;struct wlan_network *pnetwork =NULL ;char *ev = extra;char *stop = ev + wrqu->data.length;
@@ -1584,7 +1584,7 @@ static int rtw_wx_get_essid(struct net_device *dev, {u32 len, ret =0 ;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network;RT_TRACE (_module_rtl871x_mlme_c_, _drv_info_, ("rtw_wx_get_essid\n" ));
@@ -1815,7 +1815,7 @@ static int rtw_wx_set_enc(struct net_device *dev,struct ndis_802_11_wep wep;enum ndis_802_11_auth_mode authmode; -struct iw_point *erq = &(wrqu->encoding); +struct iw_point *erq = &wrqu->encoding;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev);struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;DBG_88E ("+rtw_wx_set_enc, flags = 0x%x\n" , erq->flags);
@@ -1930,8 +1930,8 @@ static int rtw_wx_get_enc(struct net_device *dev, {uint key, ret =0 ;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -struct iw_point *erq = &(wrqu->encoding); -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct iw_point *erq = &wrqu->encoding; +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@@ -2019,7 +2019,7 @@ static int rtw_wx_set_auth(struct net_device *dev, union iwreq_data *wrqu, char *extra) { struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); -struct iw_param *param = (struct iw_param *)&(wrqu->param); +struct iw_param *param = (struct iw_param *)&wrqu->param;int ret =0 ;switch (param->flags &IW_AUTH_INDEX ) {
@@ -2554,8 +2554,8 @@ static int rtw_get_ap_info(struct net_device *dev,char data[32 ];struct wlan_network *pnetwork =NULL ;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -struct __queue *queue = &(pmlmepriv->scanned_queue); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +struct __queue *queue = &pmlmepriv->scanned_queue;struct iw_point *pdata = &wrqu->data;DBG_88E ("+rtw_get_aplist_info\n" );
@@ -2699,7 +2699,7 @@ static int rtw_wext_p2p_enable(struct net_device *dev, {int ret =0 ;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct wifidirect_info *pwdinfo = &padapter->wdinfo;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;enum P2P_ROLE init_role =P2P_ROLE_DISABLE ;
@@ -2749,7 +2749,7 @@ static int rtw_p2p_set_go_nego_ssid(struct net_device *dev, {int ret =0 ;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct wifidirect_info *pwdinfo = &padapter->wdinfo;DBG_88E ("[%s] ssid = %s, len = %zu\n" , __func__, extra,strlen (extra));memcpy (pwdinfo->nego_ssid, extra,strlen (extra));
@@ -2764,7 +2764,7 @@ static int rtw_p2p_set_intent(struct net_device *dev, {int ret =0 ;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct wifidirect_info *pwdinfo = &padapter->wdinfo;u8 intent = pwdinfo->intent;switch (wrqu->data.length) {
@@ -2789,7 +2789,7 @@ static int rtw_p2p_set_listen_ch(struct net_device *dev, {int ret =0 ;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct wifidirect_info *pwdinfo = &padapter->wdinfo;u8 listen_ch = pwdinfo->listen_channel;/* Listen channel number */ switch (wrqu->data.length) {
@@ -2822,7 +2822,7 @@ static int rtw_p2p_set_op_ch(struct net_device *dev,int ret =0 ;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct wifidirect_info *pwdinfo = &padapter->wdinfo;u8 op_ch = pwdinfo->operating_channel;/* Operating channel number */ switch (wrqu->data.length) {
@@ -2850,7 +2850,7 @@ static int rtw_p2p_profilefound(struct net_device *dev, {int ret =0 ;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct wifidirect_info *pwdinfo = &padapter->wdinfo;/* Comment by Albert 2010/10/13 */ /* Input data format: */
@@ -2897,7 +2897,7 @@ static int rtw_p2p_setDN(struct net_device *dev, {int ret =0 ;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct wifidirect_info *pwdinfo = &padapter->wdinfo;DBG_88E ("[%s] %s %d\n" , __func__, extra, wrqu->data.length -1 );memset (pwdinfo->device_name,0x00 ,WPS_MAX_DEVICE_NAME_LEN );
@@ -2913,7 +2913,7 @@ static int rtw_p2p_get_status(struct net_device *dev, {int ret =0 ;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct wifidirect_info *pwdinfo = &padapter->wdinfo;if (padapter->bShowGetP2PState) DBG_88E("[%s] Role = %d, Status = %d, peer addr = %.2X:%.2X:%.2X:%.2X:%.2X:%.2X\n", __func__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo),
@@ -2940,7 +2940,7 @@ static int rtw_p2p_get_req_cm(struct net_device *dev, {int ret =0 ;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct wifidirect_info *pwdinfo = &padapter->wdinfo;sprintf (extra,"\n\nCM =%s\n" , pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req); wrqu->data.length =strlen (extra);
@@ -2953,7 +2953,7 @@ static int rtw_p2p_get_role(struct net_device *dev, {int ret =0 ;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct wifidirect_info *pwdinfo = &padapter->wdinfo; DBG_88E("[%s] Role = %d, Status = %d, peer addr = %.2X:%.2X:%.2X:%.2X:%.2X:%.2X\n", __func__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo), pwdinfo->p2p_peer_interface_addr[0], pwdinfo->p2p_peer_interface_addr[1], pwdinfo->p2p_peer_interface_addr[2],
@@ -2970,7 +2970,7 @@ static int rtw_p2p_get_peer_ifaddr(struct net_device *dev, {int ret =0 ;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct wifidirect_info *pwdinfo = &padapter->wdinfo; DBG_88E("[%s] Role = %d, Status = %d, peer addr = %pM\n", __func__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo),
@@ -2988,7 +2988,7 @@ static int rtw_p2p_get_peer_devaddr(struct net_device *dev, {int ret =0 ;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct wifidirect_info *pwdinfo = &padapter->wdinfo; DBG_88E("[%s] Role = %d, Status = %d, peer addr = %pM\n", __func__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo),
@@ -3006,7 +3006,7 @@ static int rtw_p2p_get_peer_devaddr_by_invitation(struct net_device *dev, {int ret =0 ;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct wifidirect_info *pwdinfo = &padapter->wdinfo; DBG_88E("[%s] Role = %d, Status = %d, peer addr = %pM\n", __func__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo),
@@ -3024,7 +3024,7 @@ static int rtw_p2p_get_groupid(struct net_device *dev, {int ret =0 ;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct wifidirect_info *pwdinfo = &padapter->wdinfo; sprintf(extra, "\n%.2X:%.2X:%.2X:%.2X:%.2X:%.2X %s", pwdinfo->groupid_info.go_device_addr[0], pwdinfo->groupid_info.go_device_addr[1],
@@ -3042,7 +3042,7 @@ static int rtw_p2p_get_op_ch(struct net_device *dev, {int ret =0 ;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct wifidirect_info *pwdinfo = &padapter->wdinfo;DBG_88E ("[%s] Op_ch = %02x\n" , __func__, pwdinfo->operating_channel);
@@ -3062,7 +3062,7 @@ static int rtw_p2p_get_wps_configmethod(struct net_device *dev,u8 peerMACStr[17 ] = {0x00 };struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct list_head *plist, *phead; -struct __queue *queue = &(pmlmepriv->scanned_queue); +struct __queue *queue = &pmlmepriv->scanned_queue;struct wlan_network *pnetwork =NULL ;u8 blnMatch =0 ;u16 attr_content =0 ;
@@ -3130,7 +3130,7 @@ static int rtw_p2p_get_go_device_address(struct net_device *dev,u8 peerMACStr[17 ] = {0x00 };struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct list_head *plist, *phead; -struct __queue *queue = &(pmlmepriv->scanned_queue); +struct __queue *queue = &pmlmepriv->scanned_queue;struct wlan_network *pnetwork =NULL ;u8 blnMatch =0 ;u8 *p2pie;
@@ -3213,7 +3213,7 @@ static int rtw_p2p_get_device_type(struct net_device *dev,u8 peerMACStr[17 ] = {0x00 };struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct list_head *plist, *phead; -struct __queue *queue = &(pmlmepriv->scanned_queue); +struct __queue *queue = &pmlmepriv->scanned_queue;struct wlan_network *pnetwork =NULL ;u8 blnMatch =0 ;u8 dev_type[8 ] = {0x00 };
@@ -3289,7 +3289,7 @@ static int rtw_p2p_get_device_name(struct net_device *dev,u8 peerMACStr[17 ] = {0x00 };struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct list_head *plist, *phead; -struct __queue *queue = &(pmlmepriv->scanned_queue); +struct __queue *queue = &pmlmepriv->scanned_queue;struct wlan_network *pnetwork =NULL ;u8 blnMatch =0 ;u8 dev_name[WPS_MAX_DEVICE_NAME_LEN ] = {0x00 };
@@ -3355,7 +3355,7 @@ static int rtw_p2p_get_invitation_procedure(struct net_device *dev,u8 peerMACStr[17 ] = {0x00 };struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct list_head *plist, *phead; -struct __queue *queue = &(pmlmepriv->scanned_queue); +struct __queue *queue = &pmlmepriv->scanned_queue;struct wlan_network *pnetwork =NULL ;u8 blnMatch =0 ;u8 *p2pie;
@@ -3426,12 +3426,12 @@ static int rtw_p2p_connect(struct net_device *dev, {int ret =0 ;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct wifidirect_info *pwdinfo = &padapter->wdinfo;u8 peerMAC[ETH_ALEN ] = {0x00 };int jj, kk;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct list_head *plist, *phead; -struct __queue *queue = &(pmlmepriv->scanned_queue); +struct __queue *queue = &pmlmepriv->scanned_queue;struct wlan_network *pnetwork =NULL ;uint uintPeerChannel =0 ;
@@ -3505,11 +3505,11 @@ static int rtw_p2p_invite_req(struct net_device *dev, {int ret =0 ;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct wifidirect_info *pwdinfo = &padapter->wdinfo;int jj, kk;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct list_head *plist, *phead; -struct __queue *queue = &(pmlmepriv->scanned_queue); +struct __queue *queue = &pmlmepriv->scanned_queue;struct wlan_network *pnetwork =NULL ;uint uintPeerChannel =0 ;u8 attr_content[50 ] = {0x00 };
@@ -3614,7 +3614,7 @@ static int rtw_p2p_set_persistent(struct net_device *dev, {int ret =0 ;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct wifidirect_info *pwdinfo = &padapter->wdinfo;/* The input data is 0 or 1 */ /* 0: disable persistent group functionality */
@@ -3643,12 +3643,12 @@ static int rtw_p2p_prov_disc(struct net_device *dev, {int ret =0 ;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct wifidirect_info *pwdinfo = &padapter->wdinfo;u8 peerMAC[ETH_ALEN ] = {0x00 };int jj, kk;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct list_head *plist, *phead; -struct __queue *queue = &(pmlmepriv->scanned_queue); +struct __queue *queue = &pmlmepriv->scanned_queue;struct wlan_network *pnetwork =NULL ;uint uintPeerChannel =0 ;u8 attr_content[100 ] = {0x00 };
@@ -3775,7 +3775,7 @@ static int rtw_p2p_got_wpsinfo(struct net_device *dev, {int ret =0 ;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct wifidirect_info *pwdinfo = &padapter->wdinfo;DBG_88E ("[%s] data = %s\n" , __func__, extra);/* Added by Albert 20110328 */
@@ -4077,11 +4077,11 @@ static int rtw_dbg_port(struct net_device *dev,u32 *pdata, val32;struct sta_info *psta;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -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); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;struct security_priv *psecuritypriv = &padapter->securitypriv; -struct wlan_network *cur_network = &(pmlmepriv->cur_network); +struct wlan_network *cur_network = &pmlmepriv->cur_network;struct sta_priv *pstapriv = &padapter->stapriv; pdata = (u32 *)&wrqu->data;
@@ -4388,7 +4388,7 @@ static int rtw_dbg_port(struct net_device *dev,spin_lock_bh (&pstapriv->sta_hash_lock);for (i =0 ; i <NUM_STA ; i++) { - phead = &(pstapriv->sta_hash[i]); + phead = &pstapriv->sta_hash[i]; plist = phead->next;while (phead != plist) {
@@ -4759,7 +4759,7 @@ static int set_group_key(struct adapter *padapter, u8 *key, u8 alg, int keyid)u8 keylen;struct cmd_obj *pcmd;struct setkey_parm *psetkeyparm; -struct cmd_priv *pcmdpriv = &(padapter->cmdpriv); +struct cmd_priv *pcmdpriv = &padapter->cmdpriv;int res = _SUCCESS;DBG_88E ("%s\n" , __func__);
@@ -4798,7 +4798,7 @@ static int set_group_key(struct adapter *padapter, u8 *key, u8 alg, int keyid) keylen =16 ; } -memcpy (&(psetkeyparm->key[0 ]), key, keylen); +memcpy (&psetkeyparm->key[0 ], key, keylen); pcmd->cmdcode = _SetKey_CMD_; pcmd->parmbuf = (u8 *)psetkeyparm;
@@ -4841,7 +4841,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param,struct sta_info *psta =NULL , *pbcmc_sta =NULL ;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev);struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct security_priv *psecuritypriv = &(padapter->securitypriv); +struct security_priv *psecuritypriv = &padapter->securitypriv;struct sta_priv *pstapriv = &padapter->stapriv;DBG_88E ("%s\n" , __func__);
@@ -4912,7 +4912,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, psecuritypriv->dot11PrivacyKeyIndex = wep_key_idx; -memcpy (&(psecuritypriv->dot11DefKey[wep_key_idx].skey[0 ]), pwep->KeyMaterial, pwep->KeyLength); +memcpy (&psecuritypriv->dot11DefKey[wep_key_idx].skey[0 ], pwep->KeyMaterial, pwep->KeyLength); psecuritypriv->dot11DefKeylen[wep_key_idx] = pwep->KeyLength;
@@ -4923,7 +4923,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param,/* don't update "psecuritypriv->dot11PrivacyAlgrthm" and */ /* psecuritypriv->dot11PrivacyKeyIndex = keyid", but can rtw_set_key to cam */ -memcpy (&(psecuritypriv->dot11DefKey[wep_key_idx].skey[0 ]), pwep->KeyMaterial, pwep->KeyLength); +memcpy (&psecuritypriv->dot11DefKey[wep_key_idx].skey[0 ], pwep->KeyMaterial, pwep->KeyLength); psecuritypriv->dot11DefKeylen[wep_key_idx] = pwep->KeyLength;
@@ -4950,8 +4950,8 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param,memcpy (psecuritypriv->dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key, (param->u.crypt.key_len >16 ?16 : param->u.crypt.key_len));/* set mic key */ -memcpy (psecuritypriv->dot118021XGrptxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[16 ]),8 ); -memcpy (psecuritypriv->dot118021XGrprxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[24 ]),8 ); +memcpy (psecuritypriv->dot118021XGrptxmickey[param->u.crypt.idx].skey, ¶m->u.crypt.key[16 ],8 ); +memcpy (psecuritypriv->dot118021XGrprxmickey[param->u.crypt.idx].skey, ¶m->u.crypt.key[24 ],8 ); psecuritypriv->busetkipkey = true; }else if (strcmp (param->u.crypt.alg,"CCMP" ) ==0 ) {
@@ -4993,8 +4993,8 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, psta->dot118021XPrivacy = _TKIP_;/* set mic key */ -memcpy (psta->dot11tkiptxmickey.skey, &(param->u.crypt.key[16 ]),8 ); -memcpy (psta->dot11tkiprxmickey.skey, &(param->u.crypt.key[24 ]),8 ); +memcpy (psta->dot11tkiptxmickey.skey, ¶m->u.crypt.key[16 ],8 ); +memcpy (psta->dot11tkiprxmickey.skey, ¶m->u.crypt.key[24 ],8 ); psecuritypriv->busetkipkey = true; }else if (strcmp (param->u.crypt.alg,"CCMP" ) ==0 ) {
@@ -5024,8 +5024,8 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, param->u.crypt.key, (param->u.crypt.key_len > 16 ? 16 : param->u.crypt.key_len));/* set mic key */ -memcpy (psecuritypriv->dot118021XGrptxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[16 ]),8 ); -memcpy (psecuritypriv->dot118021XGrprxmickey[param->u.crypt.idx].skey, &(param->u.crypt.key[24 ]),8 ); +memcpy (psecuritypriv->dot118021XGrptxmickey[param->u.crypt.idx].skey, ¶m->u.crypt.key[16 ],8 ); +memcpy (psecuritypriv->dot118021XGrprxmickey[param->u.crypt.idx].skey, ¶m->u.crypt.key[24 ],8 ); psecuritypriv->busetkipkey = true; }else if (strcmp (param->u.crypt.alg,"CCMP" ) ==0 ) {
@@ -5065,7 +5065,7 @@ static int rtw_set_beacon(struct net_device *dev, struct ieee_param *param, int {int ret =0 ;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct sta_priv *pstapriv = &padapter->stapriv;unsigned char *pbuf = param->u.bcn_ie.buf;
@@ -5106,7 +5106,7 @@ static int rtw_add_sta(struct net_device *dev, struct ieee_param *param)int ret =0 ;struct sta_info *psta =NULL ;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct sta_priv *pstapriv = &padapter->stapriv;DBG_88E ("rtw_add_sta(aid =%d) =%pM\n" , param->u.add_sta.aid, (param->sta_addr));
@@ -5161,7 +5161,7 @@ static int rtw_del_sta(struct net_device *dev, struct ieee_param *param)int ret =0 ;struct sta_info *psta =NULL ;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct sta_priv *pstapriv = &padapter->stapriv;int updated =0 ;
@@ -5198,7 +5198,7 @@ static int rtw_ioctl_get_sta_data(struct net_device *dev, struct ieee_param *parint ret =0 ;struct sta_info *psta =NULL ;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct sta_priv *pstapriv = &padapter->stapriv;struct ieee_param_ex *param_ex = (struct ieee_param_ex *)param;struct sta_data *psta_data = (struct sta_data *)param_ex->data;
@@ -5255,7 +5255,7 @@ static int rtw_get_sta_wpaie(struct net_device *dev, struct ieee_param *param)int ret =0 ;struct sta_info *psta =NULL ;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct sta_priv *pstapriv = &padapter->stapriv;DBG_88E ("rtw_get_sta_wpaie, sta_addr: %pM\n" , (param->sta_addr));
@@ -5293,8 +5293,8 @@ static int rtw_set_wps_beacon(struct net_device *dev, struct ieee_param *param,int ret =0 ;unsigned char wps_oui[4 ] = {0x0 ,0x50 ,0xf2 ,0x04 };struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -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;int ie_len;DBG_88E ("%s, len =%d\n" , __func__, len);
@@ -5331,7 +5331,7 @@ static int rtw_set_wps_probe_resp(struct net_device *dev, struct ieee_param *par {int ret =0 ;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;int ie_len;DBG_88E ("%s, len =%d\n" , __func__, len);
@@ -5363,7 +5363,7 @@ static int rtw_set_wps_assoc_resp(struct net_device *dev, struct ieee_param *par {int ret =0 ;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;int ie_len;DBG_88E ("%s, len =%d\n" , __func__, len);
@@ -5396,9 +5396,9 @@ static int rtw_set_hidden_ssid(struct net_device *dev, struct ieee_param *param, {int ret =0 ;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;u8 value;
@@ -5421,7 +5421,7 @@ static int rtw_ioctl_acl_remove_sta(struct net_device *dev, struct ieee_param *p {int ret =0 ;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;if (check_fwstate (pmlmepriv,WIFI_AP_STATE ) != true)return -EINVAL ;
@@ -5438,7 +5438,7 @@ static int rtw_ioctl_acl_add_sta(struct net_device *dev, struct ieee_param *para {int ret =0 ;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;if (check_fwstate (pmlmepriv,WIFI_AP_STATE ) != true)return -EINVAL ;
@@ -5455,7 +5455,7 @@ static int rtw_ioctl_set_macaddr_acl(struct net_device *dev, struct ieee_param * {int ret =0 ;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;if (check_fwstate (pmlmepriv,WIFI_AP_STATE ) != true)return -EINVAL ;
@@ -5582,7 +5582,7 @@ static int rtw_wx_set_priv(struct net_device *dev,/* added for wps2.0 @20110524 */ if (dwrq->flags ==0x8766 && len >8 ) {u32 cp_sz; -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;u8 *probereq_wpsie = ext;int probereq_wpsie_len = len;u8 wps_oui[4 ] = {0x0 ,0x50 ,0xf2 ,0x04 };
drivers/staging/r8188eu/os_dep/os_intfs.c +2 -2
@@ -591,8 +591,8 @@ static int rtw_net_set_mac_address(struct net_device *pnetdev, void *p)static struct net_device_stats *rtw_net_get_stats (struct net_device *pnetdev) {struct adapter *padapter = (struct adapter *)rtw_netdev_priv (pnetdev); -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -struct recv_priv *precvpriv = &(padapter->recvpriv); +struct xmit_priv *pxmitpriv = &padapter->xmitpriv; +struct recv_priv *precvpriv = &padapter->recvpriv; padapter->stats.tx_packets = pxmitpriv->tx_pkts;/* pxmitpriv->tx_pkts++; */ padapter->stats.rx_packets = precvpriv->rx_pkts;/* precvpriv->rx_pkts++; */
drivers/staging/r8188eu/os_dep/osdep_service.c +2 -2
@@ -96,8 +96,8 @@ void _rtw_mutex_free(struct mutex *pmutex)void _rtw_init_queue (struct __queue *pqueue) { -INIT_LIST_HEAD (&(pqueue->queue)); -spin_lock_init (&(pqueue->lock)); +INIT_LIST_HEAD (&pqueue->queue); +spin_lock_init (&pqueue->lock); }inline u32 rtw_systime_to_ms (u32 systime)
drivers/staging/r8188eu/os_dep/recv_linux.c +2 -2
@@ -114,8 +114,8 @@ int rtw_recv_indicatepkt(struct adapter *padapter,struct sk_buff *skb;struct mlme_priv *pmlmepriv = &padapter->mlmepriv; - precvpriv = &(padapter->recvpriv); - pfree_recv_queue = &(precvpriv->free_recv_queue); + precvpriv = &padapter->recvpriv; + pfree_recv_queue = &precvpriv->free_recv_queue; skb = precv_frame->pkt;if (!skb) {
drivers/staging/r8188eu/os_dep/rtw_android.c +1 -1
@@ -78,7 +78,7 @@ static int rtw_android_get_rssi(struct net_device *net, char *command, int total_len) {struct adapter *padapter = (struct adapter *)rtw_netdev_priv (net); -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct wlan_network *pcur_network = &pmlmepriv->cur_network;int bytes_written =0 ;
drivers/staging/r8188eu/os_dep/usb_intf.c +1 -1
@@ -207,7 +207,7 @@ static struct dvobj_priv *usb_dvobj_init(struct usb_interface *usb_intf) }/* 3 misc */ -sema_init (&(pdvobjpriv->usb_suspend_sema),0 ); +sema_init (&pdvobjpriv->usb_suspend_sema,0 );rtw_reset_continual_urb_error (pdvobjpriv);usb_get_dev (pusbd);
Signature · 1 line
2.32.0
PATCH 2/17 staging: r8188eu: remove unnecessary parentheses in hal dir
In reply to Michael StraubeRemove unnecessary parentheses in the hal directory reported by checkpatch.
--- .../r8188eu/hal/Hal8188ERateAdaptive.c | 8 +-- drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 16 +++--- drivers/staging/r8188eu/hal/hal_intf.c | 2 +- drivers/staging/r8188eu/hal/odm.c | 44 +++++++-------- drivers/staging/r8188eu/hal/odm_RTL8188E.c | 10 ++-- drivers/staging/r8188eu/hal/rtl8188e_cmd.c | 56 +++++++++---------- drivers/staging/r8188eu/hal/rtl8188e_dm.c | 30 +++++----- drivers/staging/r8188eu/hal/rtl8188e_mp.c | 8 +-- drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 2 +- drivers/staging/r8188eu/hal/rtl8188eu_led.c | 12 ++-- drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 10 ++-- drivers/staging/r8188eu/hal/usb_halinit.c | 32 +++++------ drivers/staging/r8188eu/hal/usb_ops_linux.c | 6 +- 13 files changed, 118 insertions(+), 118 deletions(-)
drivers/staging/r8188eu/hal/Hal8188ERateAdaptive.c +4 -4
@@ -487,7 +487,7 @@ int ODM_RAInfo_Init(struct odm_dm_struct *dm_odm, u8 macid)u8 WirelessMode =0xFF ;/* invalid value */ u8 max_rate_idx =0x13 ;/* MCS7 */ if (dm_odm->pWirelessMode) - WirelessMode = *(dm_odm->pWirelessMode); + WirelessMode = *dm_odm->pWirelessMode;if (WirelessMode !=0xFF ) {if (WirelessMode &ODM_WM_N24G )
@@ -580,7 +580,7 @@ void ODM_RA_UpdateRateInfo_8188E(struct odm_dm_struct *dm_odm, u8 macid, u8 Rateif ((NULL == dm_odm) || (macid >=ASSOCIATE_ENTRY_NUM ))return ; - pRaInfo = &(dm_odm->RAInfo[macid]); + pRaInfo = &dm_odm->RAInfo[macid]; pRaInfo->RateID = RateID; pRaInfo->RateMask = RateMask; pRaInfo->SGIEnable = SGIEnable;
@@ -594,7 +594,7 @@ void ODM_RA_SetRSSI_8188E(struct odm_dm_struct *dm_odm, u8 macid, u8 Rssi)if ((NULL == dm_odm) || (macid >=ASSOCIATE_ENTRY_NUM ))return ; - pRaInfo = &(dm_odm->RAInfo[macid]); + pRaInfo = &dm_odm->RAInfo[macid]; pRaInfo->RssiStaRA = Rssi; }
@@ -622,7 +622,7 @@ void ODM_RA_TxRPT2Handle_8188E(struct odm_dm_struct *dm_odm, u8 *TxRPT_Buf, u16else valid = (1 << MacId) & macid_entry0; - pRAInfo = &(dm_odm->RAInfo[MacId]); + pRAInfo = &dm_odm->RAInfo[MacId];if (valid) { pRAInfo->RTY[0 ] = (u16 )GET_TX_REPORT_TYPE1_RERTY_0 (pBuffer); pRAInfo->RTY[1 ] = (u16 )GET_TX_REPORT_TYPE1_RERTY_1 (pBuffer);
drivers/staging/r8188eu/hal/HalPhyRf_8188e.c +8 -8
@@ -86,7 +86,7 @@ void ODM_TxPwrTrackAdjust88E(struct odm_dm_struct *dm_odm, u8 Type,/* 0 = OFDM,static void odm_TxPwrTrackSetPwr88E (struct odm_dm_struct *dm_odm) {if (dm_odm->BbSwingFlagOfdm || dm_odm->BbSwingFlagCck) { -PHY_SetTxPowerLevel8188E (dm_odm->Adapter, *(dm_odm->pChannel)); +PHY_SetTxPowerLevel8188E (dm_odm->Adapter, *dm_odm->pChannel); dm_odm->BbSwingFlagOfdm = false; dm_odm->BbSwingFlagCck = false; }
@@ -318,7 +318,7 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E(X = dm_odm->RFCalibrateInfo.IQKMatrixRegSetting[Indexforchannel].Value[0 ][4 ];Y = dm_odm->RFCalibrateInfo.IQKMatrixRegSetting[Indexforchannel].Value[0 ][5 ]; -if ((X !=0 ) && (*(dm_odm->pBandType) ==ODM_BAND_2_4G )) { +if ((X !=0 ) && (*dm_odm->pBandType ==ODM_BAND_2_4G )) {if ((X &0x00000200 ) !=0 )/* consider minus */ X =X |0xFFFFFC00 ; ele_A = ((X * ele_D)>>8 )&0x000003FF ;
@@ -883,7 +883,7 @@ static void phy_IQCalibrate_8188E(struct adapter *adapt, s32 result[][8], u8 t, };u32 retryCount =9 ; -if (*(dm_odm->mp_mode) ==1 ) +if (*dm_odm->mp_mode ==1 ) retryCount =9 ;else retryCount =2 ;
@@ -1086,7 +1086,7 @@ void PHY_IQCalibrate_8188E(struct adapter *adapt, bool recovery) {struct hal_data_8188e *pHalData =GET_HAL_DATA (adapt);struct odm_dm_struct *dm_odm = &pHalData->odmpriv; -struct mpt_context *pMptCtx = &(adapt->mppriv.MptCtx); +struct mpt_context *pMptCtx = &adapt->mppriv.MptCtx;s32 result[4 ][8 ];/* last is final result */ u8 i, final_candidate, Indexforchannel;bool pathaok, pathbok;
@@ -1108,7 +1108,7 @@ void PHY_IQCalibrate_8188E(struct adapter *adapt, bool recovery)if (!(dm_odm->SupportAbility &ODM_RF_CALIBRATION ))return ; -if (*(dm_odm->mp_mode) ==1 ) { +if (*dm_odm->mp_mode ==1 ) { singletone = pMptCtx->bSingleTone; carrier_sup = pMptCtx->bCarrierSuppression; }
@@ -1219,9 +1219,9 @@ void PHY_LCCalibrate_8188E(struct adapter *adapt)u32 timeout =2000 , timecount =0 ;struct hal_data_8188e *pHalData =GET_HAL_DATA (adapt);struct odm_dm_struct *dm_odm = &pHalData->odmpriv; -struct mpt_context *pMptCtx = &(adapt->mppriv.MptCtx); +struct mpt_context *pMptCtx = &adapt->mppriv.MptCtx; -if (*(dm_odm->mp_mode) ==1 ) { +if (*dm_odm->mp_mode ==1 ) { singletone = pMptCtx->bSingleTone; carrier_sup = pMptCtx->bCarrierSuppression; }
@@ -1231,7 +1231,7 @@ void PHY_LCCalibrate_8188E(struct adapter *adapt)if (singletone || carrier_sup)return ; -while (*(dm_odm->pbScanInProcess) && timecount < timeout) { +while (*dm_odm->pbScanInProcess && timecount < timeout) {ODM_delay_ms (50 ); timecount +=50 ; }
drivers/staging/r8188eu/hal/hal_intf.c +1 -1
@@ -248,7 +248,7 @@ void rtw_hal_free_recv_priv(struct adapter *adapt)void rtw_hal_update_ra_mask (struct adapter *adapt,u32 mac_id,u8 rssi_level) { -struct mlme_priv *pmlmepriv = &(adapt->mlmepriv); +struct mlme_priv *pmlmepriv = &adapt->mlmepriv;if (check_fwstate (pmlmepriv,WIFI_AP_STATE ) == true) {#ifdef CONFIG_88EU_AP_MODE
drivers/staging/r8188eu/hal/odm.c +22 -22
124 lines not on this page · raw message
drivers/staging/r8188eu/hal/odm_RTL8188E.c +5 -5
@@ -16,7 +16,7 @@ static void odm_RX_HWAntDivInit(struct odm_dm_struct *dm_odm) {u32 value32; -if (*(dm_odm->mp_mode) ==1 ) { +if (*dm_odm->mp_mode ==1 ) { dm_odm->AntDivType =CGCS_RX_SW_ANTDIV ;ODM_SetBBReg (dm_odm,ODM_REG_IGI_A_11N ,BIT7 ,0 );/* disable HW AntDiv */ ODM_SetBBReg (dm_odm,ODM_REG_LNA_SWITCH_11N ,BIT31 ,1 );/* 1:CG, 0:CS */
@@ -44,7 +44,7 @@ static void odm_TRX_HWAntDivInit(struct odm_dm_struct *dm_odm) {u32 value32; -if (*(dm_odm->mp_mode) ==1 ) { +if (*dm_odm->mp_mode ==1 ) { dm_odm->AntDivType =CGCS_RX_SW_ANTDIV ;ODM_SetBBReg (dm_odm,ODM_REG_IGI_A_11N ,BIT7 ,0 );/* disable HW AntDiv */ ODM_SetBBReg (dm_odm,ODM_REG_RX_ANT_CTRL_11N ,BIT5 |BIT4 |BIT3 ,0 );/* Default RX (0/1) */
@@ -83,7 +83,7 @@ static void odm_FastAntTrainingInit(struct odm_dm_struct *dm_odm)struct fast_ant_train *dm_fat_tbl = &dm_odm->DM_FatTable;u32 AntCombination =2 ; -if (*(dm_odm->mp_mode) ==1 ) +if (*dm_odm->mp_mode ==1 )return ;for (i =0 ; i <6 ; i++) {
@@ -327,7 +327,7 @@ void ODM_AntennaDiversity_88E(struct odm_dm_struct *dm_odm)void odm_PrimaryCCA_Init (struct odm_dm_struct *dm_odm) { -struct dyn_primary_cca *PrimaryCCA = &(dm_odm->DM_PriCCA); +struct dyn_primary_cca *PrimaryCCA = &dm_odm->DM_PriCCA; PrimaryCCA->DupRTS_flag =0 ; PrimaryCCA->intf_flag =0 ;
@@ -338,7 +338,7 @@ void odm_PrimaryCCA_Init(struct odm_dm_struct *dm_odm)bool ODM_DynamicPrimaryCCA_DupRTS (struct odm_dm_struct *dm_odm) { -struct dyn_primary_cca *PrimaryCCA = &(dm_odm->DM_PriCCA); +struct dyn_primary_cca *PrimaryCCA = &dm_odm->DM_PriCCA;return PrimaryCCA->DupRTS_flag; }
drivers/staging/r8188eu/hal/rtl8188e_cmd.c +28 -28
144 lines not on this page · raw message
drivers/staging/r8188eu/hal/rtl8188e_dm.c +15 -15
@@ -30,7 +30,7 @@ static void Init_ODM_ComInfo_88E(struct adapter *Adapter) {struct hal_data_8188e *hal_data =GET_HAL_DATA (Adapter);struct dm_priv *pdmpriv = &hal_data->dmpriv; -struct odm_dm_struct *dm_odm = &(hal_data->odmpriv); +struct odm_dm_struct *dm_odm = &hal_data->odmpriv;u8 cut_ver, fab_ver;/* Init Value */
@@ -79,7 +79,7 @@ static void Update_ODM_ComInfo_88E(struct adapter *Adapter)struct mlme_priv *pmlmepriv = &Adapter->mlmepriv;struct pwrctrl_priv *pwrctrlpriv = &Adapter->pwrctrlpriv;struct hal_data_8188e *hal_data =GET_HAL_DATA (Adapter); -struct odm_dm_struct *dm_odm = &(hal_data->odmpriv); +struct odm_dm_struct *dm_odm = &hal_data->odmpriv;struct dm_priv *pdmpriv = &hal_data->dmpriv;int i;
@@ -103,17 +103,17 @@ static void Update_ODM_ComInfo_88E(struct adapter *Adapter)ODM_CmnInfoUpdate (dm_odm,ODM_CMNINFO_ABILITY , pdmpriv->InitODMFlag); -ODM_CmnInfoHook (dm_odm,ODM_CMNINFO_TX_UNI , &(Adapter->xmitpriv.tx_bytes)); -ODM_CmnInfoHook (dm_odm,ODM_CMNINFO_RX_UNI , &(Adapter->recvpriv.rx_bytes)); -ODM_CmnInfoHook (dm_odm,ODM_CMNINFO_WM_MODE , &(pmlmeext->cur_wireless_mode)); -ODM_CmnInfoHook (dm_odm,ODM_CMNINFO_SEC_CHNL_OFFSET , &(hal_data->nCur40MhzPrimeSC)); -ODM_CmnInfoHook (dm_odm,ODM_CMNINFO_SEC_MODE , &(Adapter->securitypriv.dot11PrivacyAlgrthm)); -ODM_CmnInfoHook (dm_odm,ODM_CMNINFO_BW , &(hal_data->CurrentChannelBW)); -ODM_CmnInfoHook (dm_odm,ODM_CMNINFO_CHNL , &(hal_data->CurrentChannel)); -ODM_CmnInfoHook (dm_odm,ODM_CMNINFO_NET_CLOSED , &(Adapter->net_closed)); -ODM_CmnInfoHook (dm_odm,ODM_CMNINFO_MP_MODE , &(Adapter->registrypriv.mp_mode)); -ODM_CmnInfoHook (dm_odm,ODM_CMNINFO_SCAN , &(pmlmepriv->bScanInProcess)); -ODM_CmnInfoHook (dm_odm,ODM_CMNINFO_POWER_SAVING , &(pwrctrlpriv->bpower_saving)); +ODM_CmnInfoHook (dm_odm,ODM_CMNINFO_TX_UNI , &Adapter->xmitpriv.tx_bytes); +ODM_CmnInfoHook (dm_odm,ODM_CMNINFO_RX_UNI , &Adapter->recvpriv.rx_bytes); +ODM_CmnInfoHook (dm_odm,ODM_CMNINFO_WM_MODE , &pmlmeext->cur_wireless_mode); +ODM_CmnInfoHook (dm_odm,ODM_CMNINFO_SEC_CHNL_OFFSET , &hal_data->nCur40MhzPrimeSC); +ODM_CmnInfoHook (dm_odm,ODM_CMNINFO_SEC_MODE , &Adapter->securitypriv.dot11PrivacyAlgrthm); +ODM_CmnInfoHook (dm_odm,ODM_CMNINFO_BW , &hal_data->CurrentChannelBW); +ODM_CmnInfoHook (dm_odm,ODM_CMNINFO_CHNL , &hal_data->CurrentChannel); +ODM_CmnInfoHook (dm_odm,ODM_CMNINFO_NET_CLOSED , &Adapter->net_closed); +ODM_CmnInfoHook (dm_odm,ODM_CMNINFO_MP_MODE , &Adapter->registrypriv.mp_mode); +ODM_CmnInfoHook (dm_odm,ODM_CMNINFO_SCAN , &pmlmepriv->bScanInProcess); +ODM_CmnInfoHook (dm_odm,ODM_CMNINFO_POWER_SAVING , &pwrctrlpriv->bpower_saving);ODM_CmnInfoInit (dm_odm,ODM_CMNINFO_RF_ANTENNA_TYPE , hal_data->TRxAntDivType);for (i =0 ; i <NUM_STA ; i++)
@@ -124,7 +124,7 @@ void rtl8188e_InitHalDm(struct adapter *Adapter) {struct hal_data_8188e *hal_data =GET_HAL_DATA (Adapter);struct dm_priv *pdmpriv = &hal_data->dmpriv; -struct odm_dm_struct *dm_odm = &(hal_data->odmpriv); +struct odm_dm_struct *dm_odm = &hal_data->odmpriv;dm_InitGPIOSetting (Adapter); pdmpriv->DM_Type = DM_Type_ByDriver;
@@ -216,7 +216,7 @@ u8 AntDivBeforeLink8188E(struct adapter *Adapter)struct hal_data_8188e *hal_data =GET_HAL_DATA (Adapter);struct odm_dm_struct *dm_odm = &hal_data->odmpriv;struct sw_ant_switch *dm_swat_tbl = &dm_odm->DM_SWAT_Table; -struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv); +struct mlme_priv *pmlmepriv = &Adapter->mlmepriv;/* Condition that does not need to use antenna diversity. */ if (hal_data->AntDivCfg ==0 )
drivers/staging/r8188eu/hal/rtl8188e_mp.c +4 -4
@@ -11,7 +11,7 @@s32 Hal_SetPowerTracking (struct adapter *padapter,u8 enable) {struct hal_data_8188e *pHalData =GET_HAL_DATA (padapter); -struct odm_dm_struct *pDM_Odm = &(pHalData->odmpriv); +struct odm_dm_struct *pDM_Odm = &pHalData->odmpriv;if (!netif_running (padapter->pnetdev))return _FAIL;
@@ -30,7 +30,7 @@ s32 Hal_SetPowerTracking(struct adapter *padapter, u8 enable)void Hal_GetPowerTracking (struct adapter *padapter,u8 *enable) {struct hal_data_8188e *pHalData =GET_HAL_DATA (padapter); -struct odm_dm_struct *pDM_Odm = &(pHalData->odmpriv); +struct odm_dm_struct *pDM_Odm = &pHalData->odmpriv; *enable = pDM_Odm->RFCalibrateInfo.TxPowerTrackControl; }
@@ -135,7 +135,7 @@ void Hal_MPT_CCKTxPowerAdjustbyIndex(struct adapter *pAdapter, bool beven) {struct hal_data_8188e *pHalData =GET_HAL_DATA (pAdapter);struct mpt_context *pMptCtx = &pAdapter->mppriv.MptCtx; -struct odm_dm_struct *pDM_Odm = &(pHalData->odmpriv); +struct odm_dm_struct *pDM_Odm = &pHalData->odmpriv;s32 TempCCk;u8 CCK_index, CCK_index_old =0 ;u8 Action =0 ;/* 0: no action, 1: even->odd, 2:odd->even */
@@ -209,7 +209,7 @@ void Hal_SetChannel(struct adapter *pAdapter) {struct hal_data_8188e *pHalData =GET_HAL_DATA (pAdapter);struct mp_priv *pmp = &pAdapter->mppriv; -struct odm_dm_struct *pDM_Odm = &(pHalData->odmpriv); +struct odm_dm_struct *pDM_Odm = &pHalData->odmpriv;u8 eRFPath;u8 channel = pmp->channel;
drivers/staging/r8188eu/hal/rtl8188e_rf6052.c +1 -1
@@ -186,7 +186,7 @@ i * Currently, we cannot fully disable driver dynamic } }for (idx1 =RF_PATH_A ; idx1 <=RF_PATH_B ; idx1++) { - ptr = (u8 *)(&(TxAGC[idx1])); + ptr = (u8 *)(&TxAGC[idx1]);for (idx2 =0 ; idx2 <4 ; idx2++) {if (*ptr >RF6052_MAX_TX_PWR ) *ptr =RF6052_MAX_TX_PWR ;
drivers/staging/r8188eu/hal/rtl8188eu_led.c +6 -6
@@ -74,21 +74,21 @@ void SwLedOff(struct adapter *padapter, struct LED_871x *pLed)/* Initialize all LED_871x objects. */ void rtl8188eu_InitSwLeds (struct adapter *padapter) { -struct led_priv *pledpriv = &(padapter->ledpriv); +struct led_priv *pledpriv = &padapter->ledpriv; pledpriv->LedControlHandler = LedControl8188eu; -InitLed871x (padapter, &(pledpriv->SwLed0),LED_PIN_LED0 ); +InitLed871x (padapter, &pledpriv->SwLed0,LED_PIN_LED0 ); -InitLed871x (padapter, &(pledpriv->SwLed1),LED_PIN_LED1 ); +InitLed871x (padapter, &pledpriv->SwLed1,LED_PIN_LED1 ); }/* Description: */ /* DeInitialize all LED_819xUsb objects. */ void rtl8188eu_DeInitSwLeds (struct adapter *padapter) { -struct led_priv *ledpriv = &(padapter->ledpriv); +struct led_priv *ledpriv = &padapter->ledpriv; -DeInitLed871x (&(ledpriv->SwLed0)); -DeInitLed871x (&(ledpriv->SwLed1)); +DeInitLed871x (&ledpriv->SwLed0); +DeInitLed871x (&ledpriv->SwLed1); }
drivers/staging/r8188eu/hal/rtl8188eu_xmit.c +5 -5
@@ -170,7 +170,7 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz, u8 bagstruct hal_data_8188e *haldata =GET_HAL_DATA (adapt);struct tx_desc *ptxdesc = (struct tx_desc *)pmem;struct mlme_ext_priv *pmlmeext = &adapt->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;int bmcst =IS_MCAST (pattrib->ra);if (adapt->registrypriv.mp_mode ==0 ) {
@@ -489,23 +489,23 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *adapt, struct xmit_priv *pxmitpswitch (pfirstframe->attrib.priority) {case 1 :case 2 : - ptxservq = &(psta->sta_xmitpriv.bk_q); + ptxservq = &psta->sta_xmitpriv.bk_q; phwxmit = pxmitpriv->hwxmits +3 ;break ;case 4 :case 5 : - ptxservq = &(psta->sta_xmitpriv.vi_q); + ptxservq = &psta->sta_xmitpriv.vi_q; phwxmit = pxmitpriv->hwxmits +1 ;break ;case 6 :case 7 : - ptxservq = &(psta->sta_xmitpriv.vo_q); + ptxservq = &psta->sta_xmitpriv.vo_q; phwxmit = pxmitpriv->hwxmits;break ;case 0 :case 3 :default : - ptxservq = &(psta->sta_xmitpriv.be_q); + ptxservq = &psta->sta_xmitpriv.be_q; phwxmit = pxmitpriv->hwxmits +2 ;break ; }
drivers/staging/r8188eu/hal/usb_halinit.c +16 -16
@@ -409,7 +409,7 @@ static void _InitBeaconMaxError(struct adapter *Adapter, bool InfraMode)static void _InitHWLed (struct adapter *Adapter) { -struct led_priv *pledpriv = &(Adapter->ledpriv); +struct led_priv *pledpriv = &Adapter->ledpriv;if (pledpriv->LedStrategy !=HW_LED )return ;
@@ -1053,7 +1053,7 @@ static unsigned int rtl8188eu_inirp_init(struct adapter *Adapter)struct recv_buf *precvbuf;uint status;struct intf_hdl *pintfhdl = &Adapter->iopriv.intf; -struct recv_priv *precvpriv = &(Adapter->recvpriv); +struct recv_priv *precvpriv = &Adapter->recvpriv;u32 (*_read_port)(struct intf_hdl *pintfhdl,u32 addr,u32 cnt,u8 *pmem); _read_port = pintfhdl->io_ops._read_port;
@@ -1092,7 +1092,7 @@ static unsigned int rtl8188eu_inirp_deinit(struct adapter *Adapter)/* */ static void _ReadLEDSetting (struct adapter *Adapter,u8 *PROMContent,bool AutoloadFail) { -struct led_priv *pledpriv = &(Adapter->ledpriv); +struct led_priv *pledpriv = &Adapter->ledpriv;struct hal_data_8188e *haldata =GET_HAL_DATA (Adapter); pledpriv->bRegUseLed = true;
@@ -1428,7 +1428,7 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val) {u64 tsf;struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; tsf = pmlmeext->TSFValue -do_div (pmlmeext->TSFValue, pmlmeinfo->bcn_interval *1024 ) -1024 ;/* us */
@@ -1486,7 +1486,7 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)rtw_write8 (Adapter,REG_BCN_CTRL ,rtw_read8 (Adapter,REG_BCN_CTRL )|BIT (4 )); }else {/* sitesurvey done */ struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;if ((is_client_associated_to_ap (Adapter)) || ((pmlmeinfo->state&0x03 ) ==WIFI_FW_ADHOC_STATE )) {
@@ -1556,7 +1556,7 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val) {u8 u1bAIFS, aSifsTime;struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;rtw_write8 (Adapter,REG_SLOT , val[0 ]);
@@ -1980,19 +1980,19 @@ GetHalDefVar8188EUsb(case HAL_DEF_RA_DECISION_RATE : {u8 MacID = *((u8 *)pValue); - *((u8 *)pValue) =ODM_RA_GetDecisionRate_8188E (&(haldata->odmpriv), MacID); + *((u8 *)pValue) =ODM_RA_GetDecisionRate_8188E (&haldata->odmpriv, MacID); }break ;case HAL_DEF_RA_SGI : {u8 MacID = *((u8 *)pValue); - *((u8 *)pValue) =ODM_RA_GetShortGI_8188E (&(haldata->odmpriv), MacID); + *((u8 *)pValue) =ODM_RA_GetShortGI_8188E (&haldata->odmpriv, MacID); }break ;case HAL_DEF_PT_PWR_STATUS : {u8 MacID = *((u8 *)pValue); - *((u8 *)pValue) =ODM_RA_GetHwPwrStatus_8188E (&(haldata->odmpriv), MacID); + *((u8 *)pValue) =ODM_RA_GetHwPwrStatus_8188E (&haldata->odmpriv, MacID); }break ;case HW_VAR_MAX_RX_AMPDU_FACTOR :
@@ -2089,8 +2089,8 @@ static void UpdateHalRAMask8188EUsb(struct adapter *adapt, u32 mac_id, u8 rssi_lstruct sta_info *psta;struct hal_data_8188e *haldata =GET_HAL_DATA (adapt);struct mlme_ext_priv *pmlmeext = &adapt->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct wlan_bssid_ex *cur_network = &pmlmeinfo->network;if (mac_id >=NUM_STA )/* CAM_SIZE */ return ;
@@ -2103,8 +2103,8 @@ static void UpdateHalRAMask8188EUsb(struct adapter *adapt, u32 mac_id, u8 rssi_l networkType =judge_network_type (adapt, cur_network->SupportedRates, supportRateNum) &0xf ; raid =networktype_to_raid (networkType); mask =update_supported_rate (cur_network->SupportedRates, supportRateNum); - mask |= (pmlmeinfo->HT_enable) ?update_MSC_rate (&(pmlmeinfo->HT_caps)) :0 ; -if (support_short_GI (adapt, &(pmlmeinfo->HT_caps))) + mask |= (pmlmeinfo->HT_enable) ?update_MSC_rate (&pmlmeinfo->HT_caps) :0 ; +if (support_short_GI (adapt, &pmlmeinfo->HT_caps)) shortGIrate = true;break ;case 1 :/* for broadcast/multicast */
@@ -2150,7 +2150,7 @@ static void UpdateHalRAMask8188EUsb(struct adapter *adapt, u32 mac_id, u8 rssi_l/* to do ,for 8188E-SMIC */ rtl8188e_set_raid_cmd (adapt, mask); }else { - ODM_RA_UpdateRateInfo_8188E(&(haldata->odmpriv), + ODM_RA_UpdateRateInfo_8188E(&haldata->odmpriv, mac_id, raid, mask,
@@ -2165,8 +2165,8 @@ static void UpdateHalRAMask8188EUsb(struct adapter *adapt, u32 mac_id, u8 rssi_lstatic void SetBeaconRelatedRegisters8188EUsb (struct adapter *adapt) {u32 value32; -struct mlme_ext_priv *pmlmeext = &(adapt->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_priv *pmlmeext = &adapt->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;u32 bcn_ctrl_reg =REG_BCN_CTRL ;/* reset TSF, enable update TSF, correcting TSF On Beacon */
drivers/staging/r8188eu/hal/usb_ops_linux.c +3 -3
@@ -279,12 +279,12 @@ static void interrupt_handler_8188eu(struct adapter *adapt, u16 pkt_len, u8 *pbu }/* HISR */ -memcpy (&(haldata->IntArray[0 ]), &(pbuf[USB_INTR_CONTENT_HISR_OFFSET ]),4 ); -memcpy (&(haldata->IntArray[1 ]), &(pbuf[USB_INTR_CONTENT_HISRE_OFFSET ]),4 ); +memcpy (&haldata->IntArray[0 ], &pbuf[USB_INTR_CONTENT_HISR_OFFSET ],4 ); +memcpy (&haldata->IntArray[1 ], &pbuf[USB_INTR_CONTENT_HISRE_OFFSET ],4 );/* C2H Event */ if (pbuf[0 ] !=0 ) -memcpy (&(haldata->C2hArray[0 ]), &(pbuf[USB_INTR_CONTENT_C2H_OFFSET ]),16 ); +memcpy (&haldata->C2hArray[0 ], &pbuf[USB_INTR_CONTENT_C2H_OFFSET ],16 ); }static int recvbuf2recvframe (struct adapter *adapt,struct sk_buff *pskb)
Signature · 1 line
2.32.0
PATCH 3/17 staging: r8188eu: remove unnecessary parentheses in core/rtw_mlme_ext.c
In reply to Michael StraubeRemove unnecessary parentheses in core/rtw_mlme_ext.c reported by checkpatch.
--- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 586 ++++++++++---------- 1 file changed, 293 insertions(+), 293 deletions(-)
drivers/staging/r8188eu/core/rtw_mlme_ext.c +293 -293
@@ -193,7 +193,7 @@ int init_hw_mlme_ext(struct adapter *padapter)static void init_mlme_ext_priv_value (struct adapter *padapter) {struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;unsigned char mixed_datarate[NumRates] = { _1M_RATE_, _2M_RATE_, _5M_RATE_, _11M_RATE_, _6M_RATE_, _9M_RATE_, _12M_RATE_, _18M_RATE_, _24M_RATE_, _36M_RATE_,
@@ -354,8 +354,8 @@ int init_mlme_ext_priv(struct adapter *padapter)int res = _SUCCESS;struct registry_priv *pregistrypriv = &padapter->registrypriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; pmlmeext->padapter = padapter;
@@ -508,14 +508,14 @@ unsigned int OnProbeReq(struct adapter *padapter, struct recv_frame *precv_frameunsigned char *p;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 *cur = &(pmlmeinfo->network); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct wlan_bssid_ex *cur = &pmlmeinfo->network;u8 *pframe = precv_frame->rx_data;uint len = precv_frame->len;u8 is_valid_p2p_probereq = false;#ifdef CONFIG_88EU_P2P -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct wifidirect_info *pwdinfo = &padapter->wdinfo;u8 wifi_test_chk_rate =1 ; if (!rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE) &&
@@ -638,7 +638,7 @@ unsigned int OnBeacon(struct adapter *padapter, struct recv_frame *precv_frame)int cam_idx;struct sta_info *psta;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct sta_priv *pstapriv = &padapter->stapriv;u8 *pframe = precv_frame->rx_data;
@@ -657,8 +657,8 @@ unsigned int OnBeacon(struct adapter *padapter, struct recv_frame *precv_frame) pbss =kmalloc (sizeof (struct wlan_bssid_ex ),GFP_ATOMIC );if (pbss) {if (collect_bss_info (padapter, precv_frame, pbss) == _SUCCESS) { -update_network (&(pmlmepriv->cur_network.network), pbss, padapter, true); -rtw_get_bcn_info (&(pmlmepriv->cur_network)); +update_network (&pmlmepriv->cur_network.network, pbss, padapter, true); +rtw_get_bcn_info (&pmlmepriv->cur_network); }kfree (pbss); }
@@ -736,7 +736,7 @@ unsigned int OnAuth(struct adapter *padapter, struct recv_frame *precv_frame)struct sta_priv *pstapriv = &padapter->stapriv;struct security_priv *psecuritypriv = &padapter->securitypriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;u8 *pframe = precv_frame->rx_data;uint len = precv_frame->len;
@@ -902,14 +902,14 @@ unsigned int OnAuthClient(struct adapter *padapter, struct recv_frame *precv_fraunsigned char *p;unsigned int go2asoc =0 ;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;u8 *pframe = precv_frame->rx_data;uint pkt_len = precv_frame->len;DBG_88E ("%s\n" , __func__);/* check A1 matches or not */ -if (memcmp (myid (&(padapter->eeprompriv)),get_da (pframe),ETH_ALEN )) +if (memcmp (myid (&padapter->eeprompriv),get_da (pframe),ETH_ALEN ))return _SUCCESS;if (!(pmlmeinfo->state &WIFI_FW_AUTH_STATE ))
@@ -987,13 +987,13 @@ unsigned int OnAssocReq(struct adapter *padapter, struct recv_frame *precv_framestruct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct security_priv *psecuritypriv = &padapter->securitypriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *cur = &(pmlmeinfo->network); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct wlan_bssid_ex *cur = &pmlmeinfo->network;struct sta_priv *pstapriv = &padapter->stapriv;u8 *pframe = precv_frame->rx_data;uint pkt_len = precv_frame->len;#ifdef CONFIG_88EU_P2P -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct wifidirect_info *pwdinfo = &padapter->wdinfo;u8 p2p_status_code =P2P_STATUS_SUCCESS ;u8 *p2pie;u32 p2pielen =0 ;
@@ -1440,7 +1440,7 @@ unsigned int OnAssocRsp(struct adapter *padapter, struct recv_frame *precv_framestruct ndis_802_11_var_ie *pIE;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;/* struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network); */ u8 *pframe = precv_frame->rx_data;uint pkt_len = precv_frame->len;
@@ -1448,7 +1448,7 @@ unsigned int OnAssocRsp(struct adapter *padapter, struct recv_frame *precv_frameDBG_88E ("%s\n" , __func__);/* check A1 matches or not */ -if (memcmp (myid (&(padapter->eeprompriv)),get_da (pframe),ETH_ALEN )) +if (memcmp (myid (&padapter->eeprompriv),get_da (pframe),ETH_ALEN ))return _SUCCESS;if (!(pmlmeinfo->state & (WIFI_FW_AUTH_SUCCESS |WIFI_FW_ASSOC_STATE )))
@@ -1526,10 +1526,10 @@ unsigned int OnDeAuth(struct adapter *padapter, struct recv_frame *precv_frame)unsigned short reason;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;u8 *pframe = precv_frame->rx_data;#ifdef CONFIG_88EU_P2P -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct wifidirect_info *pwdinfo = &padapter->wdinfo;#endif /* CONFIG_88EU_P2P */ /* check A3 */
@@ -1606,10 +1606,10 @@ unsigned int OnDisassoc(struct adapter *padapter, struct recv_frame *precv_frameu16 reason;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;u8 *pframe = precv_frame->rx_data;#ifdef CONFIG_88EU_P2P -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct wifidirect_info *pwdinfo = &padapter->wdinfo;#endif /* CONFIG_88EU_P2P */ /* check A3 */
@@ -1726,11 +1726,11 @@ unsigned int OnAction_back(struct adapter *padapter, struct recv_frame *precv_frunsigned char category, action;unsigned short tid, status, reason_code =0 ;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;u8 *pframe = precv_frame->rx_data;struct sta_priv *pstapriv = &padapter->stapriv;/* check RA matches or not */ -if (memcmp (myid (&(padapter->eeprompriv)),GetAddr1Ptr (pframe),ETH_ALEN ))/* for if1, sta/ap mode */ +if (memcmp (myid (&padapter->eeprompriv),GetAddr1Ptr (pframe),ETH_ALEN ))/* for if1, sta/ap mode */ return _SUCCESS;DBG_88E ("%s\n" , __func__);
@@ -1755,8 +1755,8 @@ unsigned int OnAction_back(struct adapter *padapter, struct recv_frame *precv_frDBG_88E ("%s, action=%d\n" , __func__, action);switch (action) {case RTW_WLAN_ACTION_ADDBA_REQ :/* ADDBA request */ -memcpy (&(pmlmeinfo->ADDBA_req), &(frame_body[2 ]),sizeof (struct ADDBA_request )); -process_addba_req (padapter, (u8 *)&(pmlmeinfo->ADDBA_req), addr); +memcpy (&pmlmeinfo->ADDBA_req, &frame_body[2 ],sizeof (struct ADDBA_request )); +process_addba_req (padapter, (u8 *)&pmlmeinfo->ADDBA_req, addr);if (pmlmeinfo->bAcceptAddbaReq)issue_action_BA (padapter, addr,RTW_WLAN_ACTION_ADDBA_RESP ,0 );
@@ -1823,9 +1823,9 @@ void issue_p2p_GO_request(struct adapter *padapter, u8 *raddr)unsigned char *pframe;struct rtw_ieee80211_hdr *pwlanhdr;__le16 *fctrl; -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct xmit_priv *pxmitpriv = &padapter->xmitpriv; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct wifidirect_info *pwdinfo = &padapter->wdinfo; pmgntframe =alloc_mgtxmitframe (pxmitpriv);if (!pmgntframe)
@@ -1841,12 +1841,12 @@ void issue_p2p_GO_request(struct adapter *padapter, u8 *raddr) pframe = (u8 *)(pmgntframe->buf_addr) +TXDESC_OFFSET ; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; - fctrl = &(pwlanhdr->frame_ctl); + fctrl = &pwlanhdr->frame_ctl; *(fctrl) =0 ;memcpy (pwlanhdr->addr1, raddr,ETH_ALEN ); -memcpy (pwlanhdr->addr2,myid (&(padapter->eeprompriv)),ETH_ALEN ); -memcpy (pwlanhdr->addr3,myid (&(padapter->eeprompriv)),ETH_ALEN ); +memcpy (pwlanhdr->addr2,myid (&padapter->eeprompriv),ETH_ALEN ); +memcpy (pwlanhdr->addr3,myid (&padapter->eeprompriv),ETH_ALEN );SetSeqNum (pwlanhdr, pmlmeext->mgnt_seq); pmlmeext->mgnt_seq++;
@@ -1855,12 +1855,12 @@ void issue_p2p_GO_request(struct adapter *padapter, u8 *raddr) pframe +=sizeof (struct rtw_ieee80211_hdr_3addr ); pattrib->pktlen =sizeof (struct rtw_ieee80211_hdr_3addr ); - pframe =rtw_set_fixed_ie (pframe,1 , &(category), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,1 , &(action), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,4 , (unsigned char *)&(p2poui), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,1 , &(oui_subtype), &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe,1 , &(category), &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,1 , &(action), &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,4 , (unsigned char *)&(p2poui), &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,1 , &(oui_subtype), &pattrib->pktlen); pwdinfo->negotiation_dialog_token =1 ;/* Initialize the dialog value */ - pframe =rtw_set_fixed_ie (pframe,1 , &pwdinfo->negotiation_dialog_token, &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe,1 , &pwdinfo->negotiation_dialog_token, &pattrib->pktlen);/* WPS Section */ wpsielen =0 ;
@@ -2159,9 +2159,9 @@ static void issue_p2p_GO_response(struct adapter *padapter, u8 *raddr, u8 *frameunsigned char *pframe;struct rtw_ieee80211_hdr *pwlanhdr;__le16 *fctrl; -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct xmit_priv *pxmitpriv = &padapter->xmitpriv; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct wifidirect_info *pwdinfo = &padapter->wdinfo; pmgntframe =alloc_mgtxmitframe (pxmitpriv);if (!pmgntframe)
@@ -2177,12 +2177,12 @@ static void issue_p2p_GO_response(struct adapter *padapter, u8 *raddr, u8 *frame pframe = (u8 *)(pmgntframe->buf_addr) +TXDESC_OFFSET ; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; - fctrl = &(pwlanhdr->frame_ctl); + fctrl = &pwlanhdr->frame_ctl; *(fctrl) =0 ;memcpy (pwlanhdr->addr1, raddr,ETH_ALEN ); -memcpy (pwlanhdr->addr2,myid (&(padapter->eeprompriv)),ETH_ALEN ); -memcpy (pwlanhdr->addr3,myid (&(padapter->eeprompriv)),ETH_ALEN ); +memcpy (pwlanhdr->addr2,myid (&padapter->eeprompriv),ETH_ALEN ); +memcpy (pwlanhdr->addr3,myid (&padapter->eeprompriv),ETH_ALEN );SetSeqNum (pwlanhdr, pmlmeext->mgnt_seq); pmlmeext->mgnt_seq++;
@@ -2191,12 +2191,12 @@ static void issue_p2p_GO_response(struct adapter *padapter, u8 *raddr, u8 *frame pframe +=sizeof (struct rtw_ieee80211_hdr_3addr ); pattrib->pktlen =sizeof (struct rtw_ieee80211_hdr_3addr ); - pframe =rtw_set_fixed_ie (pframe,1 , &(category), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,1 , &(action), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,4 , (unsigned char *)&(p2poui), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,1 , &(oui_subtype), &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe,1 , &(category), &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,1 , &(action), &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,4 , (unsigned char *)&(p2poui), &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,1 , &(oui_subtype), &pattrib->pktlen); pwdinfo->negotiation_dialog_token = frame_body[7 ];/* The Dialog Token of provisioning discovery request frame. */ - pframe =rtw_set_fixed_ie (pframe,1 , &(pwdinfo->negotiation_dialog_token), &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe,1 , &pwdinfo->negotiation_dialog_token, &pattrib->pktlen);/* Commented by Albert 20110328 */ /* Try to get the device password ID from the WPS IE of group negotiation request frame */
@@ -2517,9 +2517,9 @@ static void issue_p2p_GO_confirm(struct adapter *padapter, u8 *raddr, u8 result)unsigned char *pframe;struct rtw_ieee80211_hdr *pwlanhdr;__le16 *fctrl; -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct xmit_priv *pxmitpriv = &padapter->xmitpriv; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct wifidirect_info *pwdinfo = &padapter->wdinfo; pmgntframe =alloc_mgtxmitframe (pxmitpriv);if (!pmgntframe)
@@ -2535,12 +2535,12 @@ static void issue_p2p_GO_confirm(struct adapter *padapter, u8 *raddr, u8 result) pframe = (u8 *)(pmgntframe->buf_addr) +TXDESC_OFFSET ; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; - fctrl = &(pwlanhdr->frame_ctl); + fctrl = &pwlanhdr->frame_ctl; *(fctrl) =0 ;memcpy (pwlanhdr->addr1, raddr,ETH_ALEN ); -memcpy (pwlanhdr->addr2,myid (&(padapter->eeprompriv)),ETH_ALEN ); -memcpy (pwlanhdr->addr3,myid (&(padapter->eeprompriv)),ETH_ALEN ); +memcpy (pwlanhdr->addr2,myid (&padapter->eeprompriv),ETH_ALEN ); +memcpy (pwlanhdr->addr3,myid (&padapter->eeprompriv),ETH_ALEN );SetSeqNum (pwlanhdr, pmlmeext->mgnt_seq); pmlmeext->mgnt_seq++;
@@ -2549,11 +2549,11 @@ static void issue_p2p_GO_confirm(struct adapter *padapter, u8 *raddr, u8 result) pframe +=sizeof (struct rtw_ieee80211_hdr_3addr ); pattrib->pktlen =sizeof (struct rtw_ieee80211_hdr_3addr ); - pframe =rtw_set_fixed_ie (pframe,1 , &(category), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,1 , &(action), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,4 , (unsigned char *)&(p2poui), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,1 , &(oui_subtype), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,1 , &(pwdinfo->negotiation_dialog_token), &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe,1 , &(category), &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,1 , &(action), &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,4 , (unsigned char *)&(p2poui), &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,1 , &(oui_subtype), &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,1 , &pwdinfo->negotiation_dialog_token, &pattrib->pktlen);/* P2P IE Section. */
@@ -2680,9 +2680,9 @@ void issue_p2p_invitation_request(struct adapter *padapter, u8 *raddr)unsigned char *pframe;struct rtw_ieee80211_hdr *pwlanhdr;__le16 *fctrl; -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct xmit_priv *pxmitpriv = &padapter->xmitpriv; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct wifidirect_info *pwdinfo = &padapter->wdinfo; pmgntframe =alloc_mgtxmitframe (pxmitpriv);if (!pmgntframe)
@@ -2697,11 +2697,11 @@ void issue_p2p_invitation_request(struct adapter *padapter, u8 *raddr) pframe = (u8 *)(pmgntframe->buf_addr) +TXDESC_OFFSET ; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; - fctrl = &(pwlanhdr->frame_ctl); + fctrl = &pwlanhdr->frame_ctl; *(fctrl) =0 ;memcpy (pwlanhdr->addr1, raddr,ETH_ALEN ); -memcpy (pwlanhdr->addr2,myid (&(padapter->eeprompriv)),ETH_ALEN ); +memcpy (pwlanhdr->addr2,myid (&padapter->eeprompriv),ETH_ALEN );memcpy (pwlanhdr->addr3, raddr,ETH_ALEN );SetSeqNum (pwlanhdr, pmlmeext->mgnt_seq);
@@ -2711,11 +2711,11 @@ void issue_p2p_invitation_request(struct adapter *padapter, u8 *raddr) pframe +=sizeof (struct rtw_ieee80211_hdr_3addr ); pattrib->pktlen =sizeof (struct rtw_ieee80211_hdr_3addr ); - pframe =rtw_set_fixed_ie (pframe,1 , &(category), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,1 , &(action), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,4 , (unsigned char *)&(p2poui), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,1 , &(oui_subtype), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,1 , &(dialogToken), &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe,1 , &(category), &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,1 , &(action), &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,4 , (unsigned char *)&(p2poui), &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,1 , &(oui_subtype), &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,1 , &(dialogToken), &pattrib->pktlen);/* P2P IE Section. */
@@ -2926,9 +2926,9 @@ void issue_p2p_invitation_response(struct adapter *padapter, u8 *raddr, u8 dialounsigned char *pframe;struct rtw_ieee80211_hdr *pwlanhdr;__le16 *fctrl; -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct xmit_priv *pxmitpriv = &padapter->xmitpriv; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct wifidirect_info *pwdinfo = &padapter->wdinfo; pmgntframe =alloc_mgtxmitframe (pxmitpriv);if (!pmgntframe)
@@ -2943,11 +2943,11 @@ void issue_p2p_invitation_response(struct adapter *padapter, u8 *raddr, u8 dialo pframe = (u8 *)(pmgntframe->buf_addr) +TXDESC_OFFSET ; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; - fctrl = &(pwlanhdr->frame_ctl); + fctrl = &pwlanhdr->frame_ctl; *(fctrl) =0 ;memcpy (pwlanhdr->addr1, raddr,ETH_ALEN ); -memcpy (pwlanhdr->addr2,myid (&(padapter->eeprompriv)),ETH_ALEN ); +memcpy (pwlanhdr->addr2,myid (&padapter->eeprompriv),ETH_ALEN );memcpy (pwlanhdr->addr3, raddr,ETH_ALEN );SetSeqNum (pwlanhdr, pmlmeext->mgnt_seq);
@@ -2957,11 +2957,11 @@ void issue_p2p_invitation_response(struct adapter *padapter, u8 *raddr, u8 dialo pframe +=sizeof (struct rtw_ieee80211_hdr_3addr ); pattrib->pktlen =sizeof (struct rtw_ieee80211_hdr_3addr ); - pframe =rtw_set_fixed_ie (pframe,1 , &(category), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,1 , &(action), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,4 , (unsigned char *)&(p2poui), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,1 , &(oui_subtype), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,1 , &(dialogToken), &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe,1 , &(category), &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,1 , &(action), &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,4 , (unsigned char *)&(p2poui), &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,1 , &(oui_subtype), &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,1 , &(dialogToken), &pattrib->pktlen);/* P2P IE Section. */
@@ -3117,9 +3117,9 @@ void issue_p2p_provision_request(struct adapter *padapter, u8 *pssid, u8 ussidleunsigned char *pframe;struct rtw_ieee80211_hdr *pwlanhdr;__le16 *fctrl; -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct xmit_priv *pxmitpriv = &padapter->xmitpriv; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct wifidirect_info *pwdinfo = &padapter->wdinfo; pmgntframe =alloc_mgtxmitframe (pxmitpriv);if (!pmgntframe)
@@ -3135,11 +3135,11 @@ void issue_p2p_provision_request(struct adapter *padapter, u8 *pssid, u8 ussidle pframe = (u8 *)(pmgntframe->buf_addr) +TXDESC_OFFSET ; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; - fctrl = &(pwlanhdr->frame_ctl); + fctrl = &pwlanhdr->frame_ctl; *(fctrl) =0 ;memcpy (pwlanhdr->addr1, pdev_raddr,ETH_ALEN ); -memcpy (pwlanhdr->addr2,myid (&(padapter->eeprompriv)),ETH_ALEN ); +memcpy (pwlanhdr->addr2,myid (&padapter->eeprompriv),ETH_ALEN );memcpy (pwlanhdr->addr3, pdev_raddr,ETH_ALEN );SetSeqNum (pwlanhdr, pmlmeext->mgnt_seq);
@@ -3149,11 +3149,11 @@ void issue_p2p_provision_request(struct adapter *padapter, u8 *pssid, u8 ussidle pframe +=sizeof (struct rtw_ieee80211_hdr_3addr ); pattrib->pktlen =sizeof (struct rtw_ieee80211_hdr_3addr ); - pframe =rtw_set_fixed_ie (pframe,1 , &(category), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,1 , &(action), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,4 , (unsigned char *)&(p2poui), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,1 , &(oui_subtype), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,1 , &(dialogToken), &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe,1 , &(category), &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,1 , &(action), &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,4 , (unsigned char *)&(p2poui), &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,1 , &(oui_subtype), &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,1 , &(dialogToken), &pattrib->pktlen); p2pielen =build_prov_disc_request_p2p_ie (pwdinfo, pframe, pssid, ussidlen, pdev_raddr);
@@ -3224,11 +3224,11 @@ void issue_probersp_p2p(struct adapter *padapter, unsigned char *da)struct rtw_ieee80211_hdr *pwlanhdr;__le16 *fctrl;unsigned char *mac; -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); +struct xmit_priv *pxmitpriv = &padapter->xmitpriv; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;u16 beacon_interval =100 ;u16 capInfo =0 ; -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct wifidirect_info *pwdinfo = &padapter->wdinfo;u8 wpsie[255 ] = {0x00 };u32 wpsielen =0 , p2pielen =0 ;
@@ -3245,9 +3245,9 @@ void issue_probersp_p2p(struct adapter *padapter, unsigned char *da) pframe = (u8 *)(pmgntframe->buf_addr) +TXDESC_OFFSET ; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; - mac =myid (&(padapter->eeprompriv)); + mac =myid (&padapter->eeprompriv); - fctrl = &(pwlanhdr->frame_ctl); + fctrl = &pwlanhdr->frame_ctl; *(fctrl) =0 ;memcpy (pwlanhdr->addr1, da,ETH_ALEN );memcpy (pwlanhdr->addr2, mac,ETH_ALEN );
@@ -3470,13 +3470,13 @@ static int _issue_probereq_p2p(struct adapter *padapter, u8 *da, int wait_ack)struct rtw_ieee80211_hdr *pwlanhdr;__le16 *fctrl;unsigned char *mac; -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); +struct xmit_priv *pxmitpriv = &padapter->xmitpriv; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;u8 bc_addr[] = {0xff ,0xff ,0xff ,0xff ,0xff ,0xff }; -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct wifidirect_info *pwdinfo = &padapter->wdinfo;u8 wpsie[255 ] = {0x00 }, p2pie[255 ] = {0x00 };u16 wpsielen =0 , p2pielen =0 ; -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv; pmgntframe =alloc_mgtxmitframe (pxmitpriv);if (!pmgntframe)
@@ -3491,9 +3491,9 @@ static int _issue_probereq_p2p(struct adapter *padapter, u8 *da, int wait_ack) pframe = (u8 *)(pmgntframe->buf_addr) +TXDESC_OFFSET ; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; - mac =myid (&(padapter->eeprompriv)); + mac =myid (&padapter->eeprompriv); - fctrl = &(pwlanhdr->frame_ctl); + fctrl = &pwlanhdr->frame_ctl; *(fctrl) =0 ;if (da) {
@@ -3520,9 +3520,9 @@ static int _issue_probereq_p2p(struct adapter *padapter, u8 *da, int wait_ack) pattrib->pktlen =sizeof (struct rtw_ieee80211_hdr_3addr );if (rtw_p2p_chk_state (pwdinfo,P2P_STATE_TX_PROVISION_DIS_REQ )) - pframe =rtw_set_ie (pframe, _SSID_IE_, pwdinfo->tx_prov_disc_info.ssid.SsidLength, pwdinfo->tx_prov_disc_info.ssid.Ssid, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, _SSID_IE_, pwdinfo->tx_prov_disc_info.ssid.SsidLength, pwdinfo->tx_prov_disc_info.ssid.Ssid, &pattrib->pktlen);else - pframe =rtw_set_ie (pframe, _SSID_IE_,P2P_WILDCARD_SSID_LEN , pwdinfo->p2p_wildcard_ssid, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, _SSID_IE_,P2P_WILDCARD_SSID_LEN , pwdinfo->p2p_wildcard_ssid, &pattrib->pktlen);/* Use the OFDM rate in the P2P probe request frame. (6(B), 9(B), 12(B), 24(B), 36, 48, 54) */ pframe =rtw_set_ie (pframe, _SUPPORTEDRATES_IE_,8 , pwdinfo->support_rate, &pattrib->pktlen);
@@ -3793,7 +3793,7 @@ int issue_probereq_p2p_ex(struct adapter *adapter, u8 *da, int try_cnt, int waitstatic s32 rtw_action_public_decache (struct recv_frame *recv_frame,s32 token) {struct adapter *adapter = recv_frame->adapter; -struct mlme_ext_priv *mlmeext = &(adapter->mlmeextpriv); +struct mlme_ext_priv *mlmeext = &adapter->mlmeextpriv;u8 *frame = recv_frame->rx_data;u16 seq_ctrl = ((recv_frame->attrib.seq_num&0xffff ) <<4 ) | (recv_frame->attrib.frag_num &0xf );
@@ -3832,7 +3832,7 @@ static unsigned int on_action_public_p2p(struct recv_frame *precv_frame)uint len = precv_frame->len;u8 *p2p_ie;u32 p2p_ielen; -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct wifidirect_info *pwdinfo = &padapter->wdinfo;u8 result =P2P_STATUS_SUCCESS ;u8 empty_addr[ETH_ALEN ] = {0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 };#endif /* CONFIG_88EU_P2P */
@@ -4151,7 +4151,7 @@ unsigned int on_action_public(struct adapter *padapter, struct recv_frame *precvu8 category, action;/* check RA matches or not */ -if (memcmp (myid (&(padapter->eeprompriv)),GetAddr1Ptr (pframe),ETH_ALEN )) +if (memcmp (myid (&padapter->eeprompriv),GetAddr1Ptr (pframe),ETH_ALEN )) goto exit; category = frame_body[0 ];
@@ -4189,12 +4189,12 @@ unsigned int OnAction_p2p(struct adapter *padapter, struct recv_frame *precv_frau8 category, OUI_Subtype;u8 *pframe = precv_frame->rx_data;uint len = precv_frame->len; -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct wifidirect_info *pwdinfo = &padapter->wdinfo;DBG_88E ("%s\n" , __func__);/* check RA matches or not */ -if (memcmp (myid (&(padapter->eeprompriv)),GetAddr1Ptr (pframe),ETH_ALEN ))/* for if1, sta/ap mode */ +if (memcmp (myid (&padapter->eeprompriv),GetAddr1Ptr (pframe),ETH_ALEN ))/* for if1, sta/ap mode */ return _SUCCESS; frame_body = (unsigned char *)(pframe +sizeof (struct rtw_ieee80211_hdr_3addr ));
@@ -4283,7 +4283,7 @@ Following are some TX fuctions for WiFi MLMEvoid update_mgnt_tx_rate (struct adapter *padapter,u8 rate) { -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; pmlmeext->tx_rate = rate;DBG_88E ("%s(): rate = %x\n" , __func__, rate);
@@ -4291,7 +4291,7 @@ void update_mgnt_tx_rate(struct adapter *padapter, u8 rate)void update_mgntframe_attrib (struct adapter *padapter,struct pkt_attrib *pattrib) { -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;memset ((u8 *)(pattrib),0 ,sizeof (struct pkt_attrib ));
@@ -4414,14 +4414,14 @@ void issue_beacon(struct adapter *padapter, int timeout_ms)struct rtw_ieee80211_hdr *pwlanhdr;__le16 *fctrl;unsigned int rate_len; -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -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 *cur_network = &(pmlmeinfo->network); +struct xmit_priv *pxmitpriv = &padapter->xmitpriv; +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 *cur_network = &pmlmeinfo->network;u8 bc_addr[] = {0xff ,0xff ,0xff ,0xff ,0xff ,0xff };#ifdef CONFIG_88EU_P2P -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct wifidirect_info *pwdinfo = &padapter->wdinfo;#endif /* CONFIG_88EU_P2P */ pmgntframe =alloc_mgtxmitframe (pxmitpriv);
@@ -4443,11 +4443,11 @@ void issue_beacon(struct adapter *padapter, int timeout_ms) pframe = (u8 *)(pmgntframe->buf_addr) +TXDESC_OFFSET ; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; - fctrl = &(pwlanhdr->frame_ctl); + fctrl = &pwlanhdr->frame_ctl; *(fctrl) =0 ;memcpy (pwlanhdr->addr1, bc_addr,ETH_ALEN ); -memcpy (pwlanhdr->addr2,myid (&(padapter->eeprompriv)),ETH_ALEN ); +memcpy (pwlanhdr->addr2,myid (&padapter->eeprompriv),ETH_ALEN );memcpy (pwlanhdr->addr3,get_my_bssid (cur_network),ETH_ALEN );SetSeqNum (pwlanhdr,0 /*pmlmeext->mgnt_seq*/ );
@@ -4592,7 +4592,7 @@ void issue_beacon(struct adapter *padapter, int timeout_ms) pframe =rtw_set_ie (pframe, _SUPPORTEDRATES_IE_, ((rate_len >8 ) ?8 : rate_len), cur_network->SupportedRates, &pattrib->pktlen);/* DS parameter set */ - pframe =rtw_set_ie (pframe, _DSSET_IE_,1 , (unsigned char *)&(cur_network->Configuration.DSConfig), &pattrib->pktlen); + pframe =rtw_set_ie (pframe, _DSSET_IE_,1 , (unsigned char *)&cur_network->Configuration.DSConfig, &pattrib->pktlen); {u8 erpinfo =0 ;
@@ -4639,18 +4639,18 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2pstruct rtw_ieee80211_hdr *pwlanhdr;__le16 *fctrl;unsigned char *mac, *bssid; -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); +struct xmit_priv *pxmitpriv = &padapter->xmitpriv;#if defined (CONFIG_88EU_AP_MODE )u8 *pwps_ie;uint wps_ielen;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;#endif /* if defined (CONFIG_88EU_AP_MODE) */ -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct wlan_bssid_ex *cur_network = &pmlmeinfo->network;unsigned int rate_len;#ifdef CONFIG_88EU_P2P -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct wifidirect_info *pwdinfo = &padapter->wdinfo;#endif /* CONFIG_88EU_P2P */ pmgntframe =alloc_mgtxmitframe (pxmitpriv);
@@ -4668,10 +4668,10 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p pframe = (u8 *)(pmgntframe->buf_addr) +TXDESC_OFFSET ; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; - mac =myid (&(padapter->eeprompriv)); + mac =myid (&padapter->eeprompriv); bssid = cur_network->MacAddress; - fctrl = &(pwlanhdr->frame_ctl); + fctrl = &pwlanhdr->frame_ctl; *(fctrl) =0 ;memcpy (pwlanhdr->addr1, da,ETH_ALEN );memcpy (pwlanhdr->addr2, mac,ETH_ALEN );
@@ -4755,7 +4755,7 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p pframe =rtw_set_ie (pframe, _SUPPORTEDRATES_IE_, ((rate_len >8 ) ?8 : rate_len), cur_network->SupportedRates, &pattrib->pktlen);/* DS parameter set */ - pframe =rtw_set_ie (pframe, _DSSET_IE_,1 , (unsigned char *)&(cur_network->Configuration.DSConfig), &pattrib->pktlen); + pframe =rtw_set_ie (pframe, _DSSET_IE_,1 , (unsigned char *)&cur_network->Configuration.DSConfig, &pattrib->pktlen);if ((pmlmeinfo->state&0x03 ) ==WIFI_FW_ADHOC_STATE ) {u8 erpinfo =0 ;
@@ -4800,9 +4800,9 @@ static int _issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *ps__le16 *fctrl;unsigned char *mac;unsigned char bssrate[NumRates]; -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); +struct xmit_priv *pxmitpriv = &padapter->xmitpriv; +struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;int bssrate_len =0 ;u8 bc_addr[] = {0xff ,0xff ,0xff ,0xff ,0xff ,0xff };
@@ -4819,9 +4819,9 @@ static int _issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *ps pframe = (u8 *)(pmgntframe->buf_addr) +TXDESC_OFFSET ; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; - mac =myid (&(padapter->eeprompriv)); + mac =myid (&padapter->eeprompriv); - fctrl = &(pwlanhdr->frame_ctl); + fctrl = &pwlanhdr->frame_ctl; *(fctrl) =0 ;if (da) {
@@ -4844,17 +4844,17 @@ static int _issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *ps pattrib->pktlen =sizeof (struct rtw_ieee80211_hdr_3addr );if (pssid) - pframe =rtw_set_ie (pframe, _SSID_IE_, pssid->SsidLength, pssid->Ssid, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, _SSID_IE_, pssid->SsidLength, pssid->Ssid, &pattrib->pktlen);else - pframe =rtw_set_ie (pframe, _SSID_IE_,0 ,NULL , &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, _SSID_IE_,0 ,NULL , &pattrib->pktlen);get_rate_set (padapter, bssrate, &bssrate_len);if (bssrate_len >8 ) { - pframe =rtw_set_ie (pframe, _SUPPORTEDRATES_IE_,8 , bssrate, &(pattrib->pktlen)); - pframe =rtw_set_ie (pframe, _EXT_SUPPORTEDRATES_IE_, (bssrate_len -8 ), (bssrate +8 ), &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, _SUPPORTEDRATES_IE_,8 , bssrate, &pattrib->pktlen); + pframe =rtw_set_ie (pframe, _EXT_SUPPORTEDRATES_IE_, (bssrate_len -8 ), (bssrate +8 ), &pattrib->pktlen); }else { - pframe =rtw_set_ie (pframe, _SUPPORTEDRATES_IE_, bssrate_len, bssrate, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, _SUPPORTEDRATES_IE_, bssrate_len, bssrate, &pattrib->pktlen); }/* add wps_ie for wps2.0 */
@@ -4935,9 +4935,9 @@ void issue_auth(struct adapter *padapter, struct sta_info *psta, unsigned short__le16 le_val16;#endif int use_shared_key =0 ; -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct xmit_priv *pxmitpriv = &padapter->xmitpriv; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; pmgntframe =alloc_mgtxmitframe (pxmitpriv);if (!pmgntframe)
@@ -4952,7 +4952,7 @@ void issue_auth(struct adapter *padapter, struct sta_info *psta, unsigned short pframe = (u8 *)(pmgntframe->buf_addr) +TXDESC_OFFSET ; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; - fctrl = &(pwlanhdr->frame_ctl); + fctrl = &pwlanhdr->frame_ctl; *(fctrl) =0 ;SetSeqNum (pwlanhdr, pmlmeext->mgnt_seq);
@@ -4966,8 +4966,8 @@ void issue_auth(struct adapter *padapter, struct sta_info *psta, unsigned short#ifdef CONFIG_88EU_AP_MODE memcpy (pwlanhdr->addr1, psta->hwaddr,ETH_ALEN ); -memcpy (pwlanhdr->addr2,myid (&(padapter->eeprompriv)),ETH_ALEN ); -memcpy (pwlanhdr->addr3,myid (&(padapter->eeprompriv)),ETH_ALEN ); +memcpy (pwlanhdr->addr2,myid (&padapter->eeprompriv),ETH_ALEN ); +memcpy (pwlanhdr->addr3,myid (&padapter->eeprompriv),ETH_ALEN );/* setting auth algo number */ val16 = (u16 )psta->authalg;
@@ -4982,21 +4982,21 @@ void issue_auth(struct adapter *padapter, struct sta_info *psta, unsigned short le_val16 =0 ; } - pframe =rtw_set_fixed_ie (pframe, _AUTH_ALGM_NUM_, (unsigned char *)&le_val16, &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe, _AUTH_ALGM_NUM_, (unsigned char *)&le_val16, &pattrib->pktlen);/* setting auth seq number */ val16 = (u16 )psta->auth_seq; le_val16 =cpu_to_le16 (val16); - pframe =rtw_set_fixed_ie (pframe, _AUTH_SEQ_NUM_, (unsigned char *)&le_val16, &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe, _AUTH_SEQ_NUM_, (unsigned char *)&le_val16, &pattrib->pktlen);/* setting status code... */ val16 = status; le_val16 =cpu_to_le16 (val16); - pframe =rtw_set_fixed_ie (pframe, _STATUS_CODE_, (unsigned char *)&le_val16, &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe, _STATUS_CODE_, (unsigned char *)&le_val16, &pattrib->pktlen);/* added challenging text... */ if ((psta->auth_seq ==2 ) && (psta->state &WIFI_FW_AUTH_STATE ) && (use_shared_key ==1 )) - pframe =rtw_set_ie (pframe, _CHLGETXT_IE_,128 , psta->chg_txt, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, _CHLGETXT_IE_,128 , psta->chg_txt, &pattrib->pktlen);#endif }else {__le32 le_tmp32;
@@ -5014,26 +5014,26 @@ void issue_auth(struct adapter *padapter, struct sta_info *psta, unsigned shortif ((pmlmeinfo->auth_seq ==3 ) && (pmlmeinfo->state &WIFI_FW_AUTH_STATE ) && (use_shared_key ==1 )) { val32 = ((pmlmeinfo->iv++) | (pmlmeinfo->key_index <<30 )); le_tmp32 =cpu_to_le32 (val32); - pframe =rtw_set_fixed_ie (pframe,4 , (unsigned char *)&le_tmp32, &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe,4 , (unsigned char *)&le_tmp32, &pattrib->pktlen); pattrib->iv_len =4 ; } le_tmp16 =cpu_to_le16 (val16); - pframe =rtw_set_fixed_ie (pframe, _AUTH_ALGM_NUM_, (unsigned char *)&le_tmp16, &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe, _AUTH_ALGM_NUM_, (unsigned char *)&le_tmp16, &pattrib->pktlen);/* setting auth seq number */ val16 = pmlmeinfo->auth_seq; le_tmp16 =cpu_to_le16 (val16); - pframe =rtw_set_fixed_ie (pframe, _AUTH_SEQ_NUM_, (unsigned char *)&le_tmp16, &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe, _AUTH_SEQ_NUM_, (unsigned char *)&le_tmp16, &pattrib->pktlen);/* setting status code... */ le_tmp16 =cpu_to_le16 (status); - pframe =rtw_set_fixed_ie (pframe, _STATUS_CODE_, (unsigned char *)&le_tmp16, &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe, _STATUS_CODE_, (unsigned char *)&le_tmp16, &pattrib->pktlen);/* then checking to see if sending challenging text... */ if ((pmlmeinfo->auth_seq ==3 ) && (pmlmeinfo->state &WIFI_FW_AUTH_STATE ) && (use_shared_key ==1 )) { - pframe =rtw_set_ie (pframe, _CHLGETXT_IE_,128 , pmlmeinfo->chg_txt, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, _CHLGETXT_IE_,128 , pmlmeinfo->chg_txt, &pattrib->pktlen);SetPrivacy (fctrl);
@@ -5063,15 +5063,15 @@ void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_iunsigned char *pbuf, *pframe;unsigned short val;__le16 *fctrl; -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct xmit_priv *pxmitpriv = &padapter->xmitpriv; +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_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct wlan_bssid_ex *pnetwork = &pmlmeinfo->network;u8 *ie = pnetwork->IEs;__le16 lestatus, leval;#ifdef CONFIG_88EU_P2P -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct wifidirect_info *pwdinfo = &padapter->wdinfo;#endif /* CONFIG_88EU_P2P */ DBG_88E ("%s\n" , __func__);
@@ -5089,12 +5089,12 @@ void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_i pframe = (u8 *)(pmgntframe->buf_addr) +TXDESC_OFFSET ; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; - fctrl = &(pwlanhdr->frame_ctl); + fctrl = &pwlanhdr->frame_ctl; *(fctrl) =0 ;memcpy ((void *)GetAddr1Ptr (pwlanhdr), pstat->hwaddr,ETH_ALEN ); -memcpy ((void *)GetAddr2Ptr (pwlanhdr),myid (&(padapter->eeprompriv)),ETH_ALEN ); -memcpy ((void *)GetAddr3Ptr (pwlanhdr),get_my_bssid (&(pmlmeinfo->network)),ETH_ALEN ); +memcpy ((void *)GetAddr2Ptr (pwlanhdr),myid (&padapter->eeprompriv),ETH_ALEN ); +memcpy ((void *)GetAddr3Ptr (pwlanhdr),get_my_bssid (&pmlmeinfo->network),ETH_ALEN );SetSeqNum (pwlanhdr, pmlmeext->mgnt_seq); pmlmeext->mgnt_seq++;
@@ -5110,19 +5110,19 @@ void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_i/* capability */ val = *(unsigned short *)rtw_get_capability_from_ie (ie); - pframe =rtw_set_fixed_ie (pframe, _CAPABILITY_, (unsigned char *)&val, &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe, _CAPABILITY_, (unsigned char *)&val, &pattrib->pktlen); lestatus =cpu_to_le16 (status); - pframe =rtw_set_fixed_ie (pframe, _STATUS_CODE_, (unsigned char *)&lestatus, &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe, _STATUS_CODE_, (unsigned char *)&lestatus, &pattrib->pktlen); leval =cpu_to_le16 (pstat->aid |BIT (14 ) |BIT (15 )); - pframe =rtw_set_fixed_ie (pframe, _ASOC_ID_, (unsigned char *)&leval, &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe, _ASOC_ID_, (unsigned char *)&leval, &pattrib->pktlen);if (pstat->bssratelen <=8 ) { - pframe =rtw_set_ie (pframe, _SUPPORTEDRATES_IE_, pstat->bssratelen, pstat->bssrateset, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, _SUPPORTEDRATES_IE_, pstat->bssratelen, pstat->bssrateset, &pattrib->pktlen); }else { - pframe =rtw_set_ie (pframe, _SUPPORTEDRATES_IE_,8 , pstat->bssrateset, &(pattrib->pktlen)); - pframe =rtw_set_ie (pframe, _EXT_SUPPORTEDRATES_IE_, (pstat->bssratelen-8 ), pstat->bssrateset+8 , &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, _SUPPORTEDRATES_IE_,8 , pstat->bssrateset, &pattrib->pktlen); + pframe =rtw_set_ie (pframe, _EXT_SUPPORTEDRATES_IE_, (pstat->bssratelen-8 ), pstat->bssrateset+8 , &pattrib->pktlen); }if ((pstat->flags &WLAN_STA_HT ) && (pmlmepriv->htpriv.ht_option)) {
@@ -5165,7 +5165,7 @@ void issue_asocrsp(struct adapter *padapter, unsigned short status, struct sta_i }if (pmlmeinfo->assoc_AP_vendor ==HT_IOT_PEER_REALTEK ) - pframe =rtw_set_ie (pframe, _VENDOR_SPECIFIC_IE_,6 ,REALTEK_96B_IE , &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, _VENDOR_SPECIFIC_IE_,6 ,REALTEK_96B_IE , &pattrib->pktlen);/* add WPS IE ie for wps 2.0 */ if (pmlmepriv->wps_assoc_resp_ie && pmlmepriv->wps_assoc_resp_ie_len >0 ) {
@@ -5203,13 +5203,13 @@ void issue_assocreq(struct adapter *padapter)unsigned char rf_type, bssrate[NumRates], sta_bssrate[NumRates];struct ndis_802_11_var_ie *pIE;struct registry_priv *pregpriv = &padapter->registrypriv; -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct xmit_priv *pxmitpriv = &padapter->xmitpriv; +struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;int bssrate_len =0 , sta_bssrate_len =0 ;#ifdef CONFIG_88EU_P2P -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct wifidirect_info *pwdinfo = &padapter->wdinfo;u8 p2pie[255 ] = {0x00 };u16 p2pielen =0 ;#endif /* CONFIG_88EU_P2P */
@@ -5226,11 +5226,11 @@ void issue_assocreq(struct adapter *padapter) pframe = (u8 *)(pmgntframe->buf_addr) +TXDESC_OFFSET ; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; - fctrl = &(pwlanhdr->frame_ctl); + fctrl = &pwlanhdr->frame_ctl; *(fctrl) =0 ; -memcpy (pwlanhdr->addr1,get_my_bssid (&(pmlmeinfo->network)),ETH_ALEN ); -memcpy (pwlanhdr->addr2,myid (&(padapter->eeprompriv)),ETH_ALEN ); -memcpy (pwlanhdr->addr3,get_my_bssid (&(pmlmeinfo->network)),ETH_ALEN ); +memcpy (pwlanhdr->addr1,get_my_bssid (&pmlmeinfo->network),ETH_ALEN ); +memcpy (pwlanhdr->addr2,myid (&padapter->eeprompriv),ETH_ALEN ); +memcpy (pwlanhdr->addr3,get_my_bssid (&pmlmeinfo->network),ETH_ALEN );SetSeqNum (pwlanhdr, pmlmeext->mgnt_seq); pmlmeext->mgnt_seq++;
@@ -5254,7 +5254,7 @@ void issue_assocreq(struct adapter *padapter) pattrib->pktlen +=2 ;/* SSID */ - pframe =rtw_set_ie (pframe, _SSID_IE_, pmlmeinfo->network.Ssid.SsidLength, pmlmeinfo->network.Ssid.Ssid, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, _SSID_IE_, pmlmeinfo->network.Ssid.SsidLength, pmlmeinfo->network.Ssid.Ssid, &pattrib->pktlen);/* supported rate & extended supported rate */
@@ -5301,22 +5301,22 @@ void issue_assocreq(struct adapter *padapter) }if (bssrate_len >8 ) { - pframe =rtw_set_ie (pframe, _SUPPORTEDRATES_IE_,8 , bssrate, &(pattrib->pktlen)); - pframe =rtw_set_ie (pframe, _EXT_SUPPORTEDRATES_IE_, (bssrate_len -8 ), (bssrate +8 ), &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, _SUPPORTEDRATES_IE_,8 , bssrate, &pattrib->pktlen); + pframe =rtw_set_ie (pframe, _EXT_SUPPORTEDRATES_IE_, (bssrate_len -8 ), (bssrate +8 ), &pattrib->pktlen); }else { - pframe =rtw_set_ie (pframe, _SUPPORTEDRATES_IE_, bssrate_len, bssrate, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, _SUPPORTEDRATES_IE_, bssrate_len, bssrate, &pattrib->pktlen); }/* RSN */ p =rtw_get_ie ((pmlmeinfo->network.IEs +sizeof (struct ndis_802_11_fixed_ie )), _RSN_IE_2_, &ie_len, (pmlmeinfo->network.IELength -sizeof (struct ndis_802_11_fixed_ie )));if (p) - pframe =rtw_set_ie (pframe, _RSN_IE_2_, ie_len, (p +2 ), &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, _RSN_IE_2_, ie_len, (p +2 ), &pattrib->pktlen);/* HT caps */ if (padapter->mlmepriv.htpriv.ht_option) { p =rtw_get_ie ((pmlmeinfo->network.IEs +sizeof (struct ndis_802_11_fixed_ie )), _HT_CAPABILITY_IE_, &ie_len, (pmlmeinfo->network.IELength -sizeof (struct ndis_802_11_fixed_ie )));if (p && !is_ap_in_tkip (padapter)) { -memcpy (&(pmlmeinfo->HT_caps), (p +2 ),sizeof (struct HT_caps_element )); +memcpy (&pmlmeinfo->HT_caps, (p +2 ),sizeof (struct HT_caps_element ));/* to disable 40M Hz support while gd_bw_40MHz_en = 0 */ if (pregpriv->cbw40_enable ==0 )
@@ -5346,7 +5346,7 @@ void issue_assocreq(struct adapter *padapter)memcpy (pmlmeinfo->HT_caps.u.HT_cap_element.MCS_rate, MCS_rate_2R,16 );break ; } - pframe =rtw_set_ie (pframe, _HT_CAPABILITY_IE_, ie_len, (u8 *)(&(pmlmeinfo->HT_caps)), &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, _HT_CAPABILITY_IE_, ie_len, (u8 *)(&pmlmeinfo->HT_caps), &pattrib->pktlen); } }
@@ -5366,7 +5366,7 @@ void issue_assocreq(struct adapter *padapter)if (!memcmp (pIE->data,WPS_OUI ,4 )) pIE->Length =14 ; } - pframe =rtw_set_ie (pframe, _VENDOR_SPECIFIC_IE_, pIE->Length, pIE->data, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, _VENDOR_SPECIFIC_IE_, pIE->Length, pIE->data, &pattrib->pktlen); }break ;default :
@@ -5376,7 +5376,7 @@ void issue_assocreq(struct adapter *padapter) }if (pmlmeinfo->assoc_AP_vendor ==HT_IOT_PEER_REALTEK ) - pframe =rtw_set_ie (pframe, _VENDOR_SPECIFIC_IE_,6 ,REALTEK_96B_IE , &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, _VENDOR_SPECIFIC_IE_,6 ,REALTEK_96B_IE , &pattrib->pktlen);#ifdef CONFIG_88EU_P2P
@@ -5537,9 +5537,9 @@ static int _issue_nulldata(struct adapter *padapter, unsigned char *da, unsignedif (!padapter) goto exit; - pxmitpriv = &(padapter->xmitpriv); - pmlmeext = &(padapter->mlmeextpriv); - pmlmeinfo = &(pmlmeext->mlmext_info); + pxmitpriv = &padapter->xmitpriv; + pmlmeext = &padapter->mlmeextpriv; + pmlmeinfo = &pmlmeext->mlmext_info; pmgntframe =alloc_mgtxmitframe (pxmitpriv);if (!pmgntframe)
@@ -5555,7 +5555,7 @@ static int _issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned pframe = (u8 *)(pmgntframe->buf_addr) +TXDESC_OFFSET ; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; - fctrl = &(pwlanhdr->frame_ctl); + fctrl = &pwlanhdr->frame_ctl; *(fctrl) =0 ;if ((pmlmeinfo->state&0x03 ) ==WIFI_FW_AP_STATE )
@@ -5567,8 +5567,8 @@ static int _issue_nulldata(struct adapter *padapter, unsigned char *da, unsignedSetPwrMgt (fctrl);memcpy (pwlanhdr->addr1, da,ETH_ALEN ); -memcpy (pwlanhdr->addr2,myid (&(padapter->eeprompriv)),ETH_ALEN ); -memcpy (pwlanhdr->addr3,get_my_bssid (&(pmlmeinfo->network)),ETH_ALEN ); +memcpy (pwlanhdr->addr2,myid (&padapter->eeprompriv),ETH_ALEN ); +memcpy (pwlanhdr->addr3,get_my_bssid (&pmlmeinfo->network),ETH_ALEN );SetSeqNum (pwlanhdr, pmlmeext->mgnt_seq); pmlmeext->mgnt_seq++;
@@ -5597,12 +5597,12 @@ int issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned int powint ret;int i =0 ;u32 start = jiffies; -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;/* da == NULL, assum it's null data for sta to ap*/ if (!da) - da =get_my_bssid (&(pmlmeinfo->network)); + da =get_my_bssid (&pmlmeinfo->network); do { ret = _issue_nulldata(padapter, da, power_mode, wait_ms > 0 ? true : false);
@@ -5645,9 +5645,9 @@ static int _issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16struct rtw_ieee80211_hdr *pwlanhdr;__le16 *fctrl;unsigned short *qc; -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct xmit_priv *pxmitpriv = &padapter->xmitpriv; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;DBG_88E ("%s\n" , __func__);
@@ -5670,7 +5670,7 @@ static int _issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16 pframe = (u8 *)(pmgntframe->buf_addr) +TXDESC_OFFSET ; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; - fctrl = &(pwlanhdr->frame_ctl); + fctrl = &pwlanhdr->frame_ctl; *(fctrl) =0 ;if ((pmlmeinfo->state&0x03 ) ==WIFI_FW_AP_STATE )
@@ -5690,8 +5690,8 @@ static int _issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16SetAckpolicy (qc, pattrib->ack_policy);memcpy (pwlanhdr->addr1, da,ETH_ALEN ); -memcpy (pwlanhdr->addr2,myid (&(padapter->eeprompriv)),ETH_ALEN ); -memcpy (pwlanhdr->addr3,get_my_bssid (&(pmlmeinfo->network)),ETH_ALEN ); +memcpy (pwlanhdr->addr2,myid (&padapter->eeprompriv),ETH_ALEN ); +memcpy (pwlanhdr->addr3,get_my_bssid (&pmlmeinfo->network),ETH_ALEN );SetSeqNum (pwlanhdr, pmlmeext->mgnt_seq); pmlmeext->mgnt_seq++;
@@ -5720,12 +5720,12 @@ int issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16 tid, intint ret;int i =0 ;u32 start = jiffies; -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;/* da == NULL, assum it's null data for sta to ap*/ if (!da) - da =get_my_bssid (&(pmlmeinfo->network)); + da =get_my_bssid (&pmlmeinfo->network); do { ret = _issue_qos_nulldata(padapter, da, tid, wait_ms > 0 ? true : false);
@@ -5765,13 +5765,13 @@ static int _issue_deauth(struct adapter *padapter, unsigned char *da, unsigned sunsigned char *pframe;struct rtw_ieee80211_hdr *pwlanhdr;__le16 *fctrl; -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct xmit_priv *pxmitpriv = &padapter->xmitpriv; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;int ret = _FAIL;__le16 le_tmp;#ifdef CONFIG_88EU_P2P -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct wifidirect_info *pwdinfo = &padapter->wdinfo;#endif /* CONFIG_88EU_P2P */ #ifdef CONFIG_88EU_P2P
@@ -5795,12 +5795,12 @@ static int _issue_deauth(struct adapter *padapter, unsigned char *da, unsigned s pframe = (u8 *)(pmgntframe->buf_addr) +TXDESC_OFFSET ; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; - fctrl = &(pwlanhdr->frame_ctl); + fctrl = &pwlanhdr->frame_ctl; *(fctrl) =0 ;memcpy (pwlanhdr->addr1, da,ETH_ALEN ); -memcpy (pwlanhdr->addr2,myid (&(padapter->eeprompriv)),ETH_ALEN ); -memcpy (pwlanhdr->addr3,get_my_bssid (&(pmlmeinfo->network)),ETH_ALEN ); +memcpy (pwlanhdr->addr2,myid (&padapter->eeprompriv),ETH_ALEN ); +memcpy (pwlanhdr->addr3,get_my_bssid (&pmlmeinfo->network),ETH_ALEN );SetSeqNum (pwlanhdr, pmlmeext->mgnt_seq); pmlmeext->mgnt_seq++;
@@ -5810,7 +5810,7 @@ static int _issue_deauth(struct adapter *padapter, unsigned char *da, unsigned s pattrib->pktlen =sizeof (struct rtw_ieee80211_hdr_3addr ); le_tmp =cpu_to_le16 (reason); - pframe =rtw_set_fixed_ie (pframe, _RSON_CODE_, (unsigned char *)&le_tmp, &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe, _RSON_CODE_, (unsigned char *)&le_tmp, &pattrib->pktlen); pattrib->last_txcmdsz = pattrib->pktlen;
@@ -5876,8 +5876,8 @@ void issue_action_spct_ch_switch (struct adapter *padapter, u8 *ra, u8 new_ch, uunsigned char *pframe;struct rtw_ieee80211_hdr *pwlanhdr;__le16 *fctrl; -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); +struct xmit_priv *pxmitpriv = &padapter->xmitpriv; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;DBG_88E (FUNC_NDEV_FMT " ra =%pM, ch:%u, offset:%u\n" ,FUNC_NDEV_ARG (padapter->pnetdev), ra, new_ch, ch_offset);
@@ -5895,11 +5895,11 @@ void issue_action_spct_ch_switch (struct adapter *padapter, u8 *ra, u8 new_ch, u pframe = (u8 *)(pmgntframe->buf_addr) +TXDESC_OFFSET ; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; - fctrl = &(pwlanhdr->frame_ctl); + fctrl = &pwlanhdr->frame_ctl; *(fctrl) =0 ;memcpy (pwlanhdr->addr1, ra,ETH_ALEN );/* RA */ -memcpy (pwlanhdr->addr2,myid (&(padapter->eeprompriv)),ETH_ALEN );/* TA */ +memcpy (pwlanhdr->addr2,myid (&padapter->eeprompriv),ETH_ALEN );/* TA */ memcpy (pwlanhdr->addr3, ra,ETH_ALEN );/* DA = RA */ SetSeqNum (pwlanhdr, pmlmeext->mgnt_seq);
@@ -5915,12 +5915,12 @@ void issue_action_spct_ch_switch (struct adapter *padapter, u8 *ra, u8 new_ch, u category =RTW_WLAN_CATEGORY_SPECTRUM_MGMT ; action =RTW_WLAN_ACTION_SPCT_CHL_SWITCH ; - pframe =rtw_set_fixed_ie (pframe,1 , &(category), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,1 , &(action), &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe,1 , &(category), &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,1 , &(action), &pattrib->pktlen); } - pframe =rtw_set_ie_ch_switch (pframe, &(pattrib->pktlen),0 , new_ch,0 ); - pframe =rtw_set_ie_secondary_ch_offset (pframe, &(pattrib->pktlen), + pframe =rtw_set_ie_ch_switch (pframe, &pattrib->pktlen,0 , new_ch,0 ); + pframe =rtw_set_ie_secondary_ch_offset (pframe, &pattrib->pktlen,hal_ch_offset_to_secondary_ch_offset (ch_offset)); pattrib->last_txcmdsz = pattrib->pktlen;
@@ -5943,9 +5943,9 @@ void issue_action_BA(struct adapter *padapter, unsigned char *raddr, unsigned chu8 *pframe;struct rtw_ieee80211_hdr *pwlanhdr;__le16 *fctrl; -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct xmit_priv *pxmitpriv = &padapter->xmitpriv; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;struct sta_info *psta;struct sta_priv *pstapriv = &padapter->stapriv;struct registry_priv *pregpriv = &padapter->registrypriv;
@@ -5965,13 +5965,13 @@ void issue_action_BA(struct adapter *padapter, unsigned char *raddr, unsigned ch pframe = (u8 *)(pmgntframe->buf_addr) +TXDESC_OFFSET ; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; - fctrl = &(pwlanhdr->frame_ctl); + fctrl = &pwlanhdr->frame_ctl; *(fctrl) =0 ;/* memcpy(pwlanhdr->addr1, get_my_bssid(&(pmlmeinfo->network)), ETH_ALEN); */ memcpy (pwlanhdr->addr1, raddr,ETH_ALEN ); -memcpy (pwlanhdr->addr2,myid (&(padapter->eeprompriv)),ETH_ALEN ); -memcpy (pwlanhdr->addr3,get_my_bssid (&(pmlmeinfo->network)),ETH_ALEN ); +memcpy (pwlanhdr->addr2,myid (&padapter->eeprompriv),ETH_ALEN ); +memcpy (pwlanhdr->addr3,get_my_bssid (&pmlmeinfo->network),ETH_ALEN );SetSeqNum (pwlanhdr, pmlmeext->mgnt_seq); pmlmeext->mgnt_seq++;
@@ -5980,8 +5980,8 @@ void issue_action_BA(struct adapter *padapter, unsigned char *raddr, unsigned ch pframe +=sizeof (struct rtw_ieee80211_hdr_3addr ); pattrib->pktlen =sizeof (struct rtw_ieee80211_hdr_3addr ); - pframe =rtw_set_fixed_ie (pframe,1 , &(category), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,1 , &(action), &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe,1 , &(category), &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,1 , &(action), &pattrib->pktlen);if (category ==3 ) {switch (action) {
@@ -5989,15 +5989,15 @@ void issue_action_BA(struct adapter *padapter, unsigned char *raddr, unsigned chdo { pmlmeinfo->dialogToken++; }while (pmlmeinfo->dialogToken ==0 ); - pframe =rtw_set_fixed_ie (pframe,1 , &(pmlmeinfo->dialogToken), &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe,1 , &pmlmeinfo->dialogToken, &pattrib->pktlen); BA_para_set = (0x1002 | ((status &0xf ) <<2 ));/* immediate ack & 64 buffer size */ le_tmp =cpu_to_le16 (BA_para_set); - pframe =rtw_set_fixed_ie (pframe,2 , (unsigned char *)(&(le_tmp)), &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe,2 , (unsigned char *)(&(le_tmp)), &pattrib->pktlen); BA_timeout_value =5000 ;/* 5ms */ le_tmp =cpu_to_le16 (BA_timeout_value); - pframe =rtw_set_fixed_ie (pframe,2 , (unsigned char *)(&(le_tmp)), &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe,2 , (unsigned char *)(&(le_tmp)), &pattrib->pktlen); psta =rtw_get_stainfo (pstapriv, raddr);if (psta) {
@@ -6010,11 +6010,11 @@ void issue_action_BA(struct adapter *padapter, unsigned char *raddr, unsigned ch BA_starting_seqctrl = start_seq <<4 ; } le_tmp =cpu_to_le16 (BA_starting_seqctrl); - pframe =rtw_set_fixed_ie (pframe,2 , (unsigned char *)(&(le_tmp)), &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe,2 , (unsigned char *)(&(le_tmp)), &pattrib->pktlen);break ;case 1 :/* ADDBA rsp */ - pframe =rtw_set_fixed_ie (pframe,1 , &(pmlmeinfo->ADDBA_req.dialog_token), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,2 , (unsigned char *)(&status), &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe,1 , &pmlmeinfo->ADDBA_req.dialog_token, &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,2 , (unsigned char *)(&status), &pattrib->pktlen); BA_para_set =le16_to_cpu (pmlmeinfo->ADDBA_req.BA_para_set) &0x3f ;rtw_hal_get_def_var (padapter,HW_VAR_MAX_RX_AMPDU_FACTOR , &max_rx_ampdu_factor);switch (max_rx_ampdu_factor) {
@@ -6041,17 +6041,17 @@ void issue_action_BA(struct adapter *padapter, unsigned char *raddr, unsigned ch BA_para_set = BA_para_set |BIT (0 ); le_tmp =cpu_to_le16 (BA_para_set); - pframe =rtw_set_fixed_ie (pframe,2 , (unsigned char *)(&(le_tmp)), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,2 , (unsigned char *)(&(pmlmeinfo->ADDBA_req.BA_timeout_value)), &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe,2 , (unsigned char *)(&(le_tmp)), &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,2 , (unsigned char *)(&pmlmeinfo->ADDBA_req.BA_timeout_value), &pattrib->pktlen);break ;case 2 :/* DELBA */ BA_para_set = (status &0x1F ) <<3 ; le_tmp =cpu_to_le16 (BA_para_set); - pframe =rtw_set_fixed_ie (pframe,2 , (unsigned char *)(&(le_tmp)), &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe,2 , (unsigned char *)(&(le_tmp)), &pattrib->pktlen); reason_code =37 ;/* Requested from peer STA as it does not want to use the mechanism */ le_tmp =cpu_to_le16 (reason_code); - pframe =rtw_set_fixed_ie (pframe,2 , (unsigned char *)(&(le_tmp)), &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe,2 , (unsigned char *)(&(le_tmp)), &pattrib->pktlen);break ;default :break ;
@@ -6073,11 +6073,11 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter)struct rtw_ieee80211_hdr *pwlanhdr;__le16 *fctrl;struct wlan_network *pnetwork =NULL ; -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); +struct xmit_priv *pxmitpriv = &padapter->xmitpriv;struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct __queue *queue = &(pmlmepriv->scanned_queue); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct __queue *queue = &pmlmepriv->scanned_queue;u8 InfoContent[16 ] = {0 };u8 ICS [8 ][15 ];if ((pmlmepriv->num_FortyMHzIntolerant ==0 ) || (pmlmepriv->num_sta_no_ht ==0 ))
@@ -6104,12 +6104,12 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter) pframe = (u8 *)(pmgntframe->buf_addr) +TXDESC_OFFSET ; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; - fctrl = &(pwlanhdr->frame_ctl); + fctrl = &pwlanhdr->frame_ctl; *(fctrl) =0 ; -memcpy (pwlanhdr->addr1,get_my_bssid (&(pmlmeinfo->network)),ETH_ALEN ); -memcpy (pwlanhdr->addr2,myid (&(padapter->eeprompriv)),ETH_ALEN ); -memcpy (pwlanhdr->addr3,get_my_bssid (&(pmlmeinfo->network)),ETH_ALEN ); +memcpy (pwlanhdr->addr1,get_my_bssid (&pmlmeinfo->network),ETH_ALEN ); +memcpy (pwlanhdr->addr2,myid (&padapter->eeprompriv),ETH_ALEN ); +memcpy (pwlanhdr->addr3,get_my_bssid (&pmlmeinfo->network),ETH_ALEN );SetSeqNum (pwlanhdr, pmlmeext->mgnt_seq); pmlmeext->mgnt_seq++;
@@ -6118,8 +6118,8 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter) pframe +=sizeof (struct rtw_ieee80211_hdr_3addr ); pattrib->pktlen =sizeof (struct rtw_ieee80211_hdr_3addr ); - pframe =rtw_set_fixed_ie (pframe,1 , &(category), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,1 , &(action), &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe,1 , &(category), &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,1 , &(action), &pattrib->pktlen);/* */ if (pmlmepriv->num_FortyMHzIntolerant >0 ) {
@@ -6127,7 +6127,7 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter) iedata |=BIT (2 );/* 20 MHz BSS Width Request */ - pframe =rtw_set_ie (pframe, EID_BSSCoexistence,1 , &iedata, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, EID_BSSCoexistence,1 , &iedata, &pattrib->pktlen); }/* */
@@ -6182,7 +6182,7 @@ static void issue_action_BSSCoexistPacket(struct adapter *padapter) } } - pframe =rtw_set_ie (pframe, EID_BSSIntolerantChlReport, k, InfoContent, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, EID_BSSIntolerantChlReport, k, InfoContent, &pattrib->pktlen); } } }
@@ -6198,7 +6198,7 @@ unsigned int send_delba(struct adapter *padapter, u8 initiator, u8 *addr)struct sta_info *psta =NULL ;/* struct recv_reorder_ctrl *preorder_ctrl; */ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;u16 tid;if ((pmlmeinfo->state&0x03 ) !=WIFI_FW_AP_STATE )
@@ -6276,11 +6276,11 @@ void site_survey(struct adapter *padapter)unsigned char survey_channel =0 , val8;enum rt_scan_type ScanType =SCAN_PASSIVE ;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;u32 initialgain =0 ;#ifdef CONFIG_88EU_P2P -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct wifidirect_info *pwdinfo = &padapter->wdinfo;if ((pwdinfo->rx_invitereq_info.scan_op_ch_only) || (pwdinfo->p2p_info.scan_op_ch_only)) {if (pwdinfo->rx_invitereq_info.scan_op_ch_only) {
@@ -6334,9 +6334,9 @@ void site_survey(struct adapter *padapter)for (i =0 ; i <RTW_SSID_SCAN_AMOUNT ; i++) {if (pmlmeext->sitesurvey_res.ssid[i].SsidLength) {/* todo: to issue two probe req??? */ -issue_probereq (padapter, &(pmlmeext->sitesurvey_res.ssid[i]),NULL ); +issue_probereq (padapter, &pmlmeext->sitesurvey_res.ssid[i],NULL );/* msleep(SURVEY_TO>>1); */ -issue_probereq (padapter, &(pmlmeext->sitesurvey_res.ssid[i]),NULL ); +issue_probereq (padapter, &pmlmeext->sitesurvey_res.ssid[i],NULL ); } }
@@ -6448,7 +6448,7 @@ u8 collect_bss_info(struct adapter *padapter, struct recv_frame *precv_frame, stu8 ie_offset;struct registry_priv *pregistrypriv = &padapter->registrypriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;__le32 le32_tmp; len = packet_len -sizeof (struct rtw_ieee80211_hdr_3addr );
@@ -6602,8 +6602,8 @@ void start_create_ibss(struct adapter *padapter)u8 val8;u8 join_type;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)(&(pmlmeinfo->network)); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)(&pmlmeinfo->network); pmlmeext->cur_channel = (u8 )pnetwork->Configuration.DSConfig; pmlmeinfo->bcn_interval =get_beacon_interval (pnetwork);
@@ -6653,8 +6653,8 @@ void start_clnt_join(struct adapter *padapter)unsigned short caps;u8 val8;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)(&(pmlmeinfo->network)); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)(&pmlmeinfo->network);int beacon_timeout; pmlmeext->cur_channel = (u8 )pnetwork->Configuration.DSConfig;
@@ -6706,7 +6706,7 @@ void start_clnt_join(struct adapter *padapter)void start_clnt_auth (struct adapter *padapter) {struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;_cancel_timer_ex (&pmlmeext->link_timer);
@@ -6724,7 +6724,7 @@ void start_clnt_auth(struct adapter *padapter)/* issue deauth before issuing auth to deal with the situation */ /* Commented by Albert 2012/07/21 */ /* For the Win8 P2P connection, it will be hard to have a successful connection if this Wi-Fi doesn't connect to it. */ -issue_deauth (padapter, (&(pmlmeinfo->network))->MacAddress,WLAN_REASON_DEAUTH_LEAVING ); +issue_deauth (padapter, (&pmlmeinfo->network)->MacAddress,WLAN_REASON_DEAUTH_LEAVING );DBG_88E_LEVEL (_drv_info_,"start auth\n" );issue_auth (padapter,NULL ,0 );
@@ -6735,7 +6735,7 @@ void start_clnt_auth(struct adapter *padapter)void start_clnt_assoc (struct adapter *padapter) {struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;_cancel_timer_ex (&pmlmeext->link_timer);
@@ -6750,7 +6750,7 @@ void start_clnt_assoc(struct adapter *padapter)unsigned int receive_disconnect (struct adapter *padapter,unsigned char *MacAddr,unsigned short reason) {struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;/* check A3 */ if (!(!memcmp (MacAddr,get_my_bssid (&pmlmeinfo->network),ETH_ALEN )))
@@ -7033,7 +7033,7 @@ void report_join_res(struct adapter *padapter, int res)struct joinbss_event *pjoinbss_evt;struct C2HEvent_Header *pc2h_evt_hdr;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;struct cmd_priv *pcmdpriv = &padapter->cmdpriv; pcmd_obj =kzalloc (sizeof (struct cmd_obj ),GFP_ATOMIC );
@@ -7062,7 +7062,7 @@ void report_join_res(struct adapter *padapter, int res) pc2h_evt_hdr->seq =atomic_inc_return (&pmlmeext->event_seq); pjoinbss_evt = (struct joinbss_event *)(pevtcmd +sizeof (struct C2HEvent_Header )); -memcpy ((unsigned char *)(&(pjoinbss_evt->network.network)), &(pmlmeinfo->network),sizeof (struct wlan_bssid_ex )); +memcpy ((unsigned char *)(&pjoinbss_evt->network.network), &pmlmeinfo->network,sizeof (struct wlan_bssid_ex )); pjoinbss_evt->network.join_res = res; pjoinbss_evt->network.aid = res;
@@ -7111,7 +7111,7 @@ void report_del_sta_event(struct adapter *padapter, unsigned char *MacAddr, unsi pc2h_evt_hdr->seq =atomic_inc_return (&pmlmeext->event_seq); pdel_sta_evt = (struct stadel_event *)(pevtcmd +sizeof (struct C2HEvent_Header )); -memcpy ((unsigned char *)(&(pdel_sta_evt->macaddr)), MacAddr,ETH_ALEN ); +memcpy ((unsigned char *)(&pdel_sta_evt->macaddr), MacAddr,ETH_ALEN );memcpy ((unsigned char *)(pdel_sta_evt->rsvd), (unsigned char *)(&reason),2 ); psta =rtw_get_stainfo (&padapter->stapriv, MacAddr);
@@ -7163,7 +7163,7 @@ void report_add_sta_event(struct adapter *padapter, unsigned char *MacAddr, int pc2h_evt_hdr->seq =atomic_inc_return (&pmlmeext->event_seq); padd_sta_evt = (struct stassoc_event *)(pevtcmd +sizeof (struct C2HEvent_Header )); -memcpy ((unsigned char *)(&(padd_sta_evt->macaddr)), MacAddr,ETH_ALEN ); +memcpy ((unsigned char *)(&padd_sta_evt->macaddr), MacAddr,ETH_ALEN ); padd_sta_evt->cam_id = cam_idx;DBG_88E ("report_add_sta_event: add STA\n" );
@@ -7180,9 +7180,9 @@ Following are the event callback functions/* for sta/adhoc mode */ void update_sta_info (struct adapter *padapter,struct sta_info *psta) { -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); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;/* ERP */ VCS_update (padapter, psta);
@@ -7193,7 +7193,7 @@ void update_sta_info(struct adapter *padapter, struct sta_info *psta) psta->htpriv.ampdu_enable = pmlmepriv->htpriv.ampdu_enable; -if (support_short_GI (padapter, &(pmlmeinfo->HT_caps))) +if (support_short_GI (padapter, &pmlmeinfo->HT_caps)) psta->htpriv.sgi = true; psta->qos_option = true;
@@ -7222,8 +7222,8 @@ void mlmeext_joinbss_event_callback(struct adapter *padapter, int join_res) {struct sta_info *psta, *psta_bmc;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct wlan_bssid_ex *cur_network = &pmlmeinfo->network;struct sta_priv *pstapriv = &padapter->stapriv;u8 join_type;u16 media_status;
@@ -7300,8 +7300,8 @@ void mlmeext_joinbss_event_callback(struct adapter *padapter, int join_res)void mlmeext_sta_add_event_callback (struct adapter *padapter,struct sta_info *psta) { -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;u8 join_type;DBG_88E ("%s\n" , __func__);
@@ -7338,7 +7338,7 @@ void mlmeext_sta_add_event_callback(struct adapter *padapter, struct sta_info *pvoid mlmeext_sta_del_event_callback (struct adapter *padapter) {struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;if (is_client_associated_to_ap (padapter) ||is_IBSS_empty (padapter)) {rtw_hal_set_hwreg (padapter,HW_VAR_MLME_DISCONNECT ,NULL );
@@ -7374,7 +7374,7 @@ void _linked_rx_signal_strehgth_display(struct adapter *padapter);void _linked_rx_signal_strehgth_display (struct adapter *padapter) {struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;u8 mac_id;int UndecoratedSmoothedPWDB;if ((pmlmeinfo->state&0x03 ) ==WIFI_FW_STATION_STATE )
@@ -7408,9 +7408,9 @@ void linked_status_chk(struct adapter *padapter) {u32 i;struct sta_info *psta; -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); +struct xmit_priv *pxmitpriv = &padapter->xmitpriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;struct sta_priv *pstapriv = &padapter->stapriv;if (padapter->bRxRSSIDisplay)
@@ -7529,7 +7529,7 @@ void survey_timer_hdl(struct adapter *padapter)struct cmd_priv *pcmdpriv = &padapter->cmdpriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;#ifdef CONFIG_88EU_P2P -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct wifidirect_info *pwdinfo = &padapter->wdinfo;#endif /* issue rtw_sitesurvey_cmd */
@@ -7579,7 +7579,7 @@ void survey_timer_hdl(struct adapter *padapter)void link_timer_hdl (struct adapter *padapter) {struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;if (pmlmeinfo->state &WIFI_FW_AUTH_NULL ) {DBG_88E ("link_timer_hdl:no beacon while connecting\n" );
@@ -7635,7 +7635,7 @@ u8 setopmode_hdl(struct adapter *padapter, u8 *pbuf) {u8 type;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;struct setopmode_parm *psetop = (struct setopmode_parm *)pbuf;if (psetop->mode == Ndis802_11APMode) {
@@ -7660,8 +7660,8 @@ u8 setopmode_hdl(struct adapter *padapter, u8 *pbuf)u8 createbss_hdl (struct adapter *padapter,u8 *pbuf) {struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)(&(pmlmeinfo->network)); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)(&pmlmeinfo->network);struct joinbss_parm *pparm = (struct joinbss_parm *)pbuf;/* u32 initialgain; */
@@ -7723,8 +7723,8 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf)struct ndis_802_11_var_ie *pIE;struct registry_priv *pregpriv = &padapter->registrypriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)(&(pmlmeinfo->network)); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)(&pmlmeinfo->network);struct joinbss_parm *pparm = (struct joinbss_parm *)pbuf;u32 i;
@@ -7834,8 +7834,8 @@ u8 disconnect_hdl(struct adapter *padapter, unsigned char *pbuf) {struct disconnect_parm *param = (struct disconnect_parm *)pbuf;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)(&(pmlmeinfo->network)); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)(&pmlmeinfo->network);u8 val8;if (is_client_associated_to_ap (padapter))
@@ -8002,7 +8002,7 @@ u8 setauth_hdl(struct adapter *padapter, unsigned char *pbuf) {struct setauth_parm *pparm = (struct setauth_parm *)pbuf;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;if (pparm->mode <4 ) pmlmeinfo->auth_algo = pparm->mode;
@@ -8014,7 +8014,7 @@ u8 setkey_hdl(struct adapter *padapter, u8 *pbuf)unsigned short ctrl;struct setkey_parm *pparm = (struct setkey_parm *)pbuf;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;unsigned char null_sta[] = {0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 };/* main tx key for wep. */
@@ -8036,7 +8036,7 @@ u8 set_stakey_hdl(struct adapter *padapter, u8 *pbuf)u16 ctrl =0 ;u8 cam_id;/* cam_entry */ struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;struct set_stakey_parm *pparm = (struct set_stakey_parm *)pbuf;/* cam_entry: */
@@ -8107,7 +8107,7 @@ u8 add_ba_hdl(struct adapter *padapter, unsigned char *pbuf) {struct addBaReq_parm *pparm = (struct addBaReq_parm *)pbuf;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;struct sta_info *psta =rtw_get_stainfo (&padapter->stapriv, pparm->addr);
@@ -8128,9 +8128,9 @@ u8 set_tx_beacon_cmd(struct adapter *padapter) {struct cmd_obj *ph2c;struct Tx_Beacon_param *ptxBeacon_parm; -struct cmd_priv *pcmdpriv = &(padapter->cmdpriv); +struct cmd_priv *pcmdpriv = &padapter->cmdpriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;u8 res = _SUCCESS;int len_diff =0 ;
@@ -8147,7 +8147,7 @@ u8 set_tx_beacon_cmd(struct adapter *padapter) goto exit; } -memcpy (&(ptxBeacon_parm->network), &(pmlmeinfo->network),sizeof (struct wlan_bssid_ex )); +memcpy (&ptxBeacon_parm->network, &pmlmeinfo->network,sizeof (struct wlan_bssid_ex )); len_diff = update_hidden_ssid(ptxBeacon_parm->network.IEs+_BEACON_IE_OFFSET_, ptxBeacon_parm->network.IELength-_BEACON_IE_OFFSET_,
@@ -8169,7 +8169,7 @@ u8 mlme_evt_hdl(struct adapter *padapter, unsigned char *pbuf)u16 evt_sz;uint *peventbuf;void (*event_callback)(struct adapter *dev,u8 *pbuf); -struct evt_priv *pevt_priv = &(padapter->evtpriv); +struct evt_priv *pevt_priv = &padapter->evtpriv; peventbuf = (uint *)pbuf; evt_sz = (u16)(*peventbuf&0xffff );
Signature · 1 line
2.32.0
Re: [PATCH 03/17] staging: r8188eu: remove unnecessary parentheses in core/rtw_mlme_ext.c
drivers/staging/r8188eu/core/rtw_mlme_ext.c void issue_p2p_GO_request(struct adapter *padapter, u8 *raddr) · line 1858
Quoted 9 lines · Michael Straube
drivers/staging/r8188eu/core/rtw_mlme_ext.c +1
-4@@ -1855,12 +1855,12 @@ void issue_p2p_GO_request(struct adapter *padapter, u8 *raddr) pframe +=sizeof (struct rtw_ieee80211_hdr_3addr ); pattrib->pktlen =sizeof (struct rtw_ieee80211_hdr_3addr ); - pframe =rtw_set_fixed_ie (pframe,1 , &(category), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,1 , &(action), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,4 , (unsigned char *)&(p2poui), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,1 , &(oui_subtype), &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe,1 , &(category), &pattrib->pktlen);
^^^^^^^^^^^
These should be removed as well.
Review void issue_p2p_GO_request(struct adapter *padapter, u8 *raddr) · line 1859
Quoted 1 line
(quoted diff) +1
-0+ pframe = rtw_set_fixed_ie(pframe, 1, &(action), &pattrib->pktlen);
^^^^^^^^
Review void issue_p2p_GO_request(struct adapter *padapter, u8 *raddr) · line 1861
Quoted 2 lines
(quoted diff) +2
-0+ pframe = rtw_set_fixed_ie(pframe, 4, (unsigned char *)&(p2poui), &pattrib->pktlen); + pframe = rtw_set_fixed_ie(pframe, 1, &(oui_subtype), &pattrib->pktlen);
^^^^^^^^^^^^^^
All the third parameters of rtw_set_fixed_ie() in this patch really.
drivers/staging/r8188eu/core/rtw_mlme_ext.c void issue_p2p_GO_request(struct adapter *padapter, u8 *raddr) · line 1866
Quoted 6 lines
drivers/staging/r8188eu/core/rtw_mlme_ext.c +1
-1pwdinfo->negotiation_dialog_token =1 ;/* Initialize the dialog value */ - pframe =rtw_set_fixed_ie (pframe,1 , &pwdinfo->negotiation_dialog_token, &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe,1 , &pwdinfo->negotiation_dialog_token, &pattrib->pktlen);/* WPS Section */ wpsielen =0 ;
regards,
dan carpenter
PATCH 4/17 staging: r8188eu: remove unnecessary parentheses in core/rtw_ap.c
In reply to Michael StraubeRemove unnecessary parentheses in core/rtw_ap.c reported by checkpatch.
--- drivers/staging/r8188eu/core/rtw_ap.c | 80 +++++++++++++-------------- 1 file changed, 40 insertions(+), 40 deletions(-)
drivers/staging/r8188eu/core/rtw_ap.c +40 -40
@@ -12,7 +12,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;
@@ -28,9 +28,9 @@ 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); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; pmlmepriv->update_bcn = false; pmlmeext->bstart_bss = false;
@@ -52,9 +52,9 @@ void free_mlme_ap_info(struct adapter *padapter)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;/* update TIM IE */
@@ -426,7 +426,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)
@@ -518,7 +518,7 @@ 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);
@@ -600,9 +600,9 @@ 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;u16 sta_cap_info;
@@ -670,7 +670,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__);
@@ -703,15 +703,15 @@ 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 ;#ifdef CONFIG_88EU_P2P -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct wifidirect_info *pwdinfo = &padapter->wdinfo;#endif /* CONFIG_88EU_P2P */ bcn_interval = (u16 )pnetwork->Configuration.BeaconPeriod;
@@ -846,7 +846,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;
@@ -880,7 +880,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) pbss_network->Rssi =0 ; -memcpy (pbss_network->MacAddress,myid (&(padapter->eeprompriv)),ETH_ALEN ); +memcpy (pbss_network->MacAddress,myid (&padapter->eeprompriv),ETH_ALEN );/* beacon interval */ p =rtw_get_beacon_interval_from_ie (ie);/* 8: TimeStamp, 2: Beacon Interval 2:Capability */
@@ -1219,10 +1219,10 @@ static void update_bcn_fixed_ie(struct adapter *padapter)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 ;
@@ -1281,10 +1281,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;
@@ -1355,8 +1355,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 ;
@@ -1413,7 +1413,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)
@@ -1506,8 +1506,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) {
@@ -1641,8 +1641,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;
@@ -1750,7 +1750,7 @@ int rtw_ap_inform_ch_switch(struct adapter *padapter, u8 new_ch, u8 ch_offset)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 };if ((pmlmeinfo->state&0x03 ) !=WIFI_FW_AP_STATE )
@@ -1785,7 +1785,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));
@@ -1821,7 +1821,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)
@@ -1858,7 +1858,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;
@@ -1894,7 +1894,7 @@ void start_ap_mode(struct adapter *padapter) pmlmepriv->p2p_probe_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++) {
@@ -1909,7 +1909,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;
Signature · 1 line
2.32.0
PATCH 5/17 staging: r8188eu: remove unnecessary parentheses in core/rtw_wlan_util.c
In reply to Michael StraubeRemove unnecessary parentheses in core/rtw_wlan_util.c reported by checkpatch.
--- drivers/staging/r8188eu/core/rtw_wlan_util.c | 70 ++++++++++---------- 1 file changed, 35 insertions(+), 35 deletions(-)
drivers/staging/r8188eu/core/rtw_wlan_util.c +35 -35
@@ -107,7 +107,7 @@ u8 judge_network_type(struct adapter *padapter, unsigned char *rate, int ratelen {u8 network_type =0 ;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;if (pmlmeext->cur_channel >14 ) {if (pmlmeinfo->HT_enable)
@@ -411,7 +411,7 @@ int is_client_associated_to_ap(struct adapter *padapter)return _FAIL; pmlmeext = &padapter->mlmeextpriv; - pmlmeinfo = &(pmlmeext->mlmext_info); + pmlmeinfo = &pmlmeext->mlmext_info;if ((pmlmeinfo->state &WIFI_FW_ASSOC_SUCCESS ) && ((pmlmeinfo->state&0x03 ) ==WIFI_FW_STATION_STATE ))return true;
@@ -422,7 +422,7 @@ int is_client_associated_to_ap(struct adapter *padapter)int is_client_associated_to_ibss (struct adapter *padapter) {struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;if ((pmlmeinfo->state &WIFI_FW_ASSOC_SUCCESS ) && ((pmlmeinfo->state&0x03 ) ==WIFI_FW_ADHOC_STATE ))return true;
@@ -434,7 +434,7 @@ int is_IBSS_empty(struct adapter *padapter) {unsigned int i;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;for (i =IBSS_START_MAC_ID ; i <NUM_STA ; i++) {if (pmlmeinfo->FW_sta_info[i].status ==1 )
@@ -505,7 +505,7 @@ int allocate_fw_sta_entry(struct adapter *padapter) {unsigned int mac_id;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;for (mac_id =IBSS_START_MAC_ID ; mac_id <NUM_STA ; mac_id++) {if (pmlmeinfo->FW_sta_info[mac_id].status ==0 ) {
@@ -521,7 +521,7 @@ int allocate_fw_sta_entry(struct adapter *padapter)void flush_all_cam_entry (struct adapter *padapter) {struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;rtw_hal_set_hwreg (padapter,HW_VAR_CAM_INVALID_ALL ,NULL );
@@ -531,9 +531,9 @@ void flush_all_cam_entry(struct adapter *padapter)int WMM_param_handler (struct adapter *padapter,struct ndis_802_11_var_ie *pIE) {/* struct registry_priv *pregpriv = &padapter->registrypriv; */ -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); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;if (pmlmepriv->qospriv.qos_option ==0 ) { pmlmeinfo->WMM_enable =0 ;
@@ -541,7 +541,7 @@ int WMM_param_handler(struct adapter *padapter, struct ndis_802_11_var_ie *pIE) } pmlmeinfo->WMM_enable =1 ; -memcpy (&(pmlmeinfo->WMM_param), (pIE->data +6 ),sizeof (struct WMM_para_element )); +memcpy (&pmlmeinfo->WMM_param, pIE->data +6 ,sizeof (struct WMM_para_element ));return true; }
@@ -553,7 +553,7 @@ void WMMOnAssocRsp(struct adapter *padapter)u32 acParm, i;u32 edca[4 ], inx[4 ];struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;struct xmit_priv *pxmitpriv = &padapter->xmitpriv;struct registry_priv *pregpriv = &padapter->registrypriv;
@@ -655,9 +655,9 @@ static void bwmode_update_check(struct adapter *padapter, struct ndis_802_11_varunsigned char new_bwmode;unsigned char new_ch_offset;struct HT_info_element *pHT_info; -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); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;struct registry_priv *pregistrypriv = &padapter->registrypriv;struct ht_priv *phtpriv = &pmlmepriv->htpriv;
@@ -706,7 +706,7 @@ static void bwmode_update_check(struct adapter *padapter, struct ndis_802_11_varif (pmlmeinfo->bwmode_updated) {struct sta_info *psta; -struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network); +struct wlan_bssid_ex *cur_network = &pmlmeinfo->network;struct sta_priv *pstapriv = &padapter->stapriv;/* set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode); */
@@ -734,7 +734,7 @@ void HT_caps_handler(struct adapter *padapter, struct ndis_802_11_var_ie *pIE)u8 rf_type;u8 max_AMPDU_len, 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;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct ht_priv *phtpriv = &pmlmepriv->htpriv;
@@ -780,7 +780,7 @@ void HT_caps_handler(struct adapter *padapter, struct ndis_802_11_var_ie *pIE)void HT_info_handler (struct adapter *padapter,struct ndis_802_11_var_ie *pIE) {struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct ht_priv *phtpriv = &pmlmepriv->htpriv;
@@ -794,7 +794,7 @@ void HT_info_handler(struct adapter *padapter, struct ndis_802_11_var_ie *pIE)return ; pmlmeinfo->HT_info_enable =1 ; -memcpy (&(pmlmeinfo->HT_info), pIE->data, pIE->Length); +memcpy (&pmlmeinfo->HT_info, pIE->data, pIE->Length); }void HTOnAssocRsp (struct adapter *padapter)
@@ -803,7 +803,7 @@ void HTOnAssocRsp(struct adapter *padapter)unsigned char min_MPDU_spacing;/* struct registry_priv *pregpriv = &padapter->registrypriv; */ 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__);
@@ -831,20 +831,20 @@ void HTOnAssocRsp(struct adapter *padapter)void ERP_IE_handler (struct adapter *padapter,struct ndis_802_11_var_ie *pIE) {struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;if (pIE->Length >1 )return ; pmlmeinfo->ERP_enable =1 ; -memcpy (&(pmlmeinfo->ERP_IE), pIE->data, pIE->Length); +memcpy (&pmlmeinfo->ERP_IE, pIE->data, pIE->Length); }void VCS_update (struct adapter *padapter,struct sta_info *psta) {struct registry_priv *pregpriv = &padapter->registrypriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;switch (pregpriv->vrtl_carrier_sense) {/* 0:off 1:on 2:auto */ case 0 :/* off */
@@ -883,7 +883,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)unsigned int len;unsigned char *p;unsigned short val16, subtype; -struct wlan_network *cur_network = &(Adapter->mlmepriv.cur_network); +struct wlan_network *cur_network = &Adapter->mlmepriv.cur_network;/* u8 wpa_ie[255], rsn_ie[255]; */ u16 wpa_len =0 , rsn_len =0 ;u8 encryp_protocol =0 ;
@@ -1101,8 +1101,8 @@ unsigned int is_ap_in_tkip(struct adapter *padapter)u32 i;struct ndis_802_11_var_ie *pIE;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct wlan_bssid_ex *cur_network = &pmlmeinfo->network;if (rtw_get_capability ((struct wlan_bssid_ex *)cur_network) &WLAN_CAPABILITY_PRIVACY ) {for (i =sizeof (struct ndis_802_11_fixed_ie ); i < pmlmeinfo->network.IELength;) {
@@ -1168,8 +1168,8 @@ unsigned int is_ap_in_wep(struct adapter *padapter)u32 i;struct ndis_802_11_var_ie *pIE;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct wlan_bssid_ex *cur_network = &pmlmeinfo->network;if (rtw_get_capability ((struct wlan_bssid_ex *)cur_network) &WLAN_CAPABILITY_PRIVACY ) {for (i =sizeof (struct ndis_802_11_fixed_ie ); i < pmlmeinfo->network.IELength;) {
@@ -1278,7 +1278,7 @@ int support_short_GI(struct adapter *padapter, struct HT_caps_element *pHT_caps) {unsigned char bit_offset;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;if (!(pmlmeinfo->HT_enable))return _FAIL;
@@ -1429,7 +1429,7 @@ unsigned char check_assoc_AP(u8 *pframe, uint len)void update_IOT_info (struct adapter *padapter) {struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;switch (pmlmeinfo->assoc_AP_vendor) {case HT_IOT_PEER_MARVELL :
@@ -1458,7 +1458,7 @@ void update_IOT_info(struct adapter *padapter)void update_capinfo (struct adapter *Adapter,u16 updateCap) {struct mlme_ext_priv *pmlmeext = &Adapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;bool ShortPreamble;/* Check preamble mode, 2005.01.06, by rcnjko. */
@@ -1506,8 +1506,8 @@ void update_wireless_mode(struct adapter *padapter)int ratelen, network_type =0 ;u32 SIFS_Timer;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); -struct wlan_bssid_ex *cur_network = &(pmlmeinfo->network); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; +struct wlan_bssid_ex *cur_network = &pmlmeinfo->network;unsigned char *rate = cur_network->SupportedRates; ratelen =rtw_get_rateset_len (cur_network->SupportedRates);
@@ -1547,8 +1547,8 @@ void update_wireless_mode(struct adapter *padapter)void update_bmc_sta_support_rate (struct adapter *padapter,u32 mac_id) { -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;if (pmlmeext->cur_wireless_mode &WIRELESS_11B ) {/* Only B, B/G, and B/G/N AP could use CCK rate */
@@ -1563,8 +1563,8 @@ int update_sta_support_rate(struct adapter *padapter, u8 *pvar_ie, uint var_ie_lunsigned int ie_len;struct ndis_802_11_var_ie *pIE;int supportRateNum =0 ; -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; pIE = (struct ndis_802_11_var_ie *)rtw_get_ie (pvar_ie, _SUPPORTEDRATES_IE_, &ie_len, var_ie_len);if (!pIE)
@@ -1589,7 +1589,7 @@ void process_addba_req(struct adapter *padapter, u8 *paddba_req, u8 *addr)struct sta_priv *pstapriv = &padapter->stapriv;struct ADDBA_request *preq = (struct ADDBA_request *)paddba_req;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; psta =rtw_get_stainfo (pstapriv, addr);
Signature · 1 line
2.32.0
PATCH 6/17 staging: r8188eu: remove unnecessary parentheses in core/rtw_led.c
In reply to Michael StraubeRemove unnecessary parentheses in core/rtw_led.c reported by checkpatch.
--- drivers/staging/r8188eu/core/rtw_led.c | 354 ++++++++++++------------- 1 file changed, 177 insertions(+), 177 deletions(-)
drivers/staging/r8188eu/core/rtw_led.c +177 -177
@@ -17,7 +17,7 @@ void BlinkTimerCallback(struct timer_list *t)if ((padapter->bSurpriseRemoved) || (padapter->bDriverStopped))return ; -_set_workitem (&(pLed->BlinkWorkItem)); +_set_workitem (&pLed->BlinkWorkItem); }/* */
@@ -62,7 +62,7 @@ void InitLed871x(struct adapter *padapter, struct LED_871x *pLed, enum LED_PIN_8ResetLedStatus (pLed);timer_setup (&pLed->BlinkTimer, BlinkTimerCallback,0 ); -_init_workitem (&(pLed->BlinkWorkItem), BlinkWorkItemCallback, pLed); +_init_workitem (&pLed->BlinkWorkItem, BlinkWorkItemCallback, pLed); }/* */
@@ -71,8 +71,8 @@ void InitLed871x(struct adapter *padapter, struct LED_871x *pLed, enum LED_PIN_8/* */ void DeInitLed871x (struct LED_871x *pLed) { -_cancel_workitem_sync (&(pLed->BlinkWorkItem)); -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_workitem_sync (&pLed->BlinkWorkItem); +_cancel_timer_ex (&pLed->BlinkTimer);ResetLedStatus (pLed); }
@@ -85,7 +85,7 @@ void DeInitLed871x(struct LED_871x *pLed)static void SwLedBlink (struct LED_871x *pLed) {struct adapter *padapter = pLed->padapter; -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;u8 bStopBlinking = false;/* Change LED according to BlinkingLedState specified. */
@@ -141,20 +141,20 @@ static void SwLedBlink(struct LED_871x *pLed)/* Schedule a timer to toggle LED state. */ switch (pLed->CurrLedState) {case LED_BLINK_NORMAL : -_set_timer (&(pLed->BlinkTimer),LED_BLINK_NORMAL_INTERVAL ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_NORMAL_INTERVAL );break ;case LED_BLINK_SLOWLY :case LED_BLINK_StartToBlink: -_set_timer (&(pLed->BlinkTimer),LED_BLINK_SLOWLY_INTERVAL ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_SLOWLY_INTERVAL );break ;case LED_BLINK_WPS :if (pLed->BlinkingLedState ==RTW_LED_ON ) -_set_timer (&(pLed->BlinkTimer),LED_BLINK_LONG_INTERVAL ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_LONG_INTERVAL );else -_set_timer (&(pLed->BlinkTimer),LED_BLINK_LONG_INTERVAL ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_LONG_INTERVAL );break ;default : -_set_timer (&(pLed->BlinkTimer),LED_BLINK_SLOWLY_INTERVAL ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_SLOWLY_INTERVAL );break ; } }
@@ -163,7 +163,7 @@ static void SwLedBlink(struct LED_871x *pLed)static void SwLedBlink1 (struct LED_871x *pLed) {struct adapter *padapter = pLed->padapter; -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;u8 bStopBlinking = false;/* Change LED according to BlinkingLedState specified. */
@@ -184,14 +184,14 @@ static void SwLedBlink1(struct LED_871x *pLed) pLed->BlinkingLedState =RTW_LED_OFF ; else pLed->BlinkingLedState = RTW_LED_ON; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_NO_LINK_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_NO_LINK_INTERVAL_ALPHA );break ;case LED_BLINK_NORMAL :if (pLed->bLedOn) pLed->BlinkingLedState =RTW_LED_OFF ;else pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_LINK_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_LINK_INTERVAL_ALPHA );break ;case LED_BLINK_SCAN : pLed->BlinkTimes--;
@@ -205,7 +205,7 @@ static void SwLedBlink1(struct LED_871x *pLed) pLed->BlinkingLedState =RTW_LED_OFF ; else pLed->BlinkingLedState = RTW_LED_ON; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_LINK_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_LINK_INTERVAL_ALPHA ); }else if (!check_fwstate (pmlmepriv, _FW_LINKED)) { pLed->bLedNoLinkBlinkInProgress = true; pLed->CurrLedState =LED_BLINK_SLOWLY ;
@@ -213,7 +213,7 @@ static void SwLedBlink1(struct LED_871x *pLed) pLed->BlinkingLedState =RTW_LED_OFF ; else pLed->BlinkingLedState = RTW_LED_ON; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_NO_LINK_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_NO_LINK_INTERVAL_ALPHA ); } pLed->bLedScanBlinkInProgress = false; }else {
@@ -221,7 +221,7 @@ static void SwLedBlink1(struct LED_871x *pLed) pLed->BlinkingLedState =RTW_LED_OFF ; else pLed->BlinkingLedState = RTW_LED_ON; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_SCAN_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_SCAN_INTERVAL_ALPHA ); }break ;case LED_BLINK_TXRX :
@@ -236,7 +236,7 @@ static void SwLedBlink1(struct LED_871x *pLed) pLed->BlinkingLedState =RTW_LED_OFF ; else pLed->BlinkingLedState = RTW_LED_ON; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_LINK_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_LINK_INTERVAL_ALPHA ); }else if (!check_fwstate (pmlmepriv, _FW_LINKED)) { pLed->bLedNoLinkBlinkInProgress = true; pLed->CurrLedState =LED_BLINK_SLOWLY ;
@@ -244,7 +244,7 @@ static void SwLedBlink1(struct LED_871x *pLed) pLed->BlinkingLedState =RTW_LED_OFF ; else pLed->BlinkingLedState = RTW_LED_ON; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_NO_LINK_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_NO_LINK_INTERVAL_ALPHA ); } pLed->BlinkTimes =0 ; pLed->bLedBlinkInProgress = false;
@@ -253,7 +253,7 @@ static void SwLedBlink1(struct LED_871x *pLed) pLed->BlinkingLedState =RTW_LED_OFF ; else pLed->BlinkingLedState = RTW_LED_ON; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_FASTER_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_FASTER_INTERVAL_ALPHA ); }break ;case LED_BLINK_WPS :
@@ -261,7 +261,7 @@ static void SwLedBlink1(struct LED_871x *pLed) pLed->BlinkingLedState =RTW_LED_OFF ; else pLed->BlinkingLedState = RTW_LED_ON; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_SCAN_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_SCAN_INTERVAL_ALPHA );break ;case LED_BLINK_WPS_STOP :/* WPS success */ if (pLed->BlinkingLedState ==RTW_LED_ON )
@@ -276,12 +276,12 @@ static void SwLedBlink1(struct LED_871x *pLed) pLed->BlinkingLedState =RTW_LED_OFF ; else pLed->BlinkingLedState = RTW_LED_ON; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_LINK_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_LINK_INTERVAL_ALPHA ); pLed->bLedWPSBlinkInProgress = false; }else { pLed->BlinkingLedState =RTW_LED_OFF ; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_WPS_SUCESS_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_WPS_SUCESS_INTERVAL_ALPHA ); }break ;default :
@@ -292,7 +292,7 @@ static void SwLedBlink1(struct LED_871x *pLed)static void SwLedBlink2 (struct LED_871x *pLed) {struct adapter *padapter = pLed->padapter; -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;u8 bStopBlinking = false;/* Change LED according to BlinkingLedState specified. */
@@ -327,7 +327,7 @@ static void SwLedBlink2(struct LED_871x *pLed) pLed->BlinkingLedState =RTW_LED_OFF ; else pLed->BlinkingLedState = RTW_LED_ON; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_SCAN_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_SCAN_INTERVAL_ALPHA ); } }break ;
@@ -356,7 +356,7 @@ static void SwLedBlink2(struct LED_871x *pLed) pLed->BlinkingLedState =RTW_LED_OFF ; else pLed->BlinkingLedState = RTW_LED_ON; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_FASTER_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_FASTER_INTERVAL_ALPHA ); } }break ;
@@ -368,7 +368,7 @@ static void SwLedBlink2(struct LED_871x *pLed)static void SwLedBlink3 (struct LED_871x *pLed) {struct adapter *padapter = pLed->padapter; -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;u8 bStopBlinking = false;/* Change LED according to BlinkingLedState specified. */
@@ -407,7 +407,7 @@ static void SwLedBlink3(struct LED_871x *pLed) pLed->BlinkingLedState =RTW_LED_OFF ; else pLed->BlinkingLedState = RTW_LED_ON; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_SCAN_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_SCAN_INTERVAL_ALPHA ); } }break ;
@@ -439,7 +439,7 @@ static void SwLedBlink3(struct LED_871x *pLed) pLed->BlinkingLedState =RTW_LED_OFF ; else pLed->BlinkingLedState = RTW_LED_ON; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_FASTER_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_FASTER_INTERVAL_ALPHA ); } }break ;
@@ -448,12 +448,12 @@ static void SwLedBlink3(struct LED_871x *pLed) pLed->BlinkingLedState =RTW_LED_OFF ; else pLed->BlinkingLedState = RTW_LED_ON; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_SCAN_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_SCAN_INTERVAL_ALPHA );break ;case LED_BLINK_WPS_STOP :/* WPS success */ if (pLed->BlinkingLedState ==RTW_LED_ON ) { pLed->BlinkingLedState =RTW_LED_OFF ; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_WPS_SUCESS_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_WPS_SUCESS_INTERVAL_ALPHA ); bStopBlinking = false; }else { bStopBlinking = true;
@@ -477,8 +477,8 @@ static void SwLedBlink3(struct LED_871x *pLed)static void SwLedBlink4 (struct LED_871x *pLed) {struct adapter *padapter = pLed->padapter; -struct led_priv *ledpriv = &(padapter->ledpriv); -struct LED_871x *pLed1 = &(ledpriv->SwLed1); +struct led_priv *ledpriv = &padapter->ledpriv; +struct LED_871x *pLed1 = &ledpriv->SwLed1;u8 bStopBlinking = false;/* Change LED according to BlinkingLedState specified. */
@@ -499,15 +499,15 @@ static void SwLedBlink4(struct LED_871x *pLed) pLed->BlinkingLedState =RTW_LED_OFF ; else pLed->BlinkingLedState = RTW_LED_ON; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_NO_LINK_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_NO_LINK_INTERVAL_ALPHA );break ;case LED_BLINK_StartToBlink:if (pLed->bLedOn) { pLed->BlinkingLedState =RTW_LED_OFF ; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_SLOWLY_INTERVAL ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_SLOWLY_INTERVAL ); }else { pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_NORMAL_INTERVAL ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_NORMAL_INTERVAL ); }break ;case LED_BLINK_SCAN :
@@ -524,7 +524,7 @@ static void SwLedBlink4(struct LED_871x *pLed) pLed->BlinkingLedState =RTW_LED_OFF ; else pLed->BlinkingLedState = RTW_LED_ON; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_NO_LINK_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_NO_LINK_INTERVAL_ALPHA ); } pLed->bLedScanBlinkInProgress = false; }else {
@@ -535,7 +535,7 @@ static void SwLedBlink4(struct LED_871x *pLed) pLed->BlinkingLedState =RTW_LED_OFF ; else pLed->BlinkingLedState = RTW_LED_ON; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_SCAN_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_SCAN_INTERVAL_ALPHA ); } }break ;
@@ -553,7 +553,7 @@ static void SwLedBlink4(struct LED_871x *pLed) pLed->BlinkingLedState =RTW_LED_OFF ; else pLed->BlinkingLedState = RTW_LED_ON; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_NO_LINK_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_NO_LINK_INTERVAL_ALPHA ); } pLed->bLedBlinkInProgress = false; }else {
@@ -564,17 +564,17 @@ static void SwLedBlink4(struct LED_871x *pLed) pLed->BlinkingLedState =RTW_LED_OFF ; else pLed->BlinkingLedState = RTW_LED_ON; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_FASTER_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_FASTER_INTERVAL_ALPHA ); } }break ;case LED_BLINK_WPS :if (pLed->bLedOn) { pLed->BlinkingLedState =RTW_LED_OFF ; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_SLOWLY_INTERVAL ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_SLOWLY_INTERVAL ); }else { pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_NORMAL_INTERVAL ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_NORMAL_INTERVAL ); }break ;case LED_BLINK_WPS_STOP :/* WPS authentication fail */
@@ -583,7 +583,7 @@ static void SwLedBlink4(struct LED_871x *pLed)else pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_NORMAL_INTERVAL ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_NORMAL_INTERVAL );break ;case LED_BLINK_WPS_STOP_OVERLAP :/* WPS session overlap */ pLed->BlinkTimes--;
@@ -597,14 +597,14 @@ static void SwLedBlink4(struct LED_871x *pLed)if (bStopBlinking) { pLed->BlinkTimes =10 ; pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_LINK_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_LINK_INTERVAL_ALPHA ); }else {if (pLed->bLedOn) pLed->BlinkingLedState =RTW_LED_OFF ;else pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_NORMAL_INTERVAL ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_NORMAL_INTERVAL ); }break ;default :
@@ -639,7 +639,7 @@ static void SwLedBlink5(struct LED_871x *pLed) pLed->CurrLedState =RTW_LED_ON ; pLed->BlinkingLedState =RTW_LED_ON ;if (!pLed->bLedOn) -_set_timer (&(pLed->BlinkTimer),LED_BLINK_FASTER_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_FASTER_INTERVAL_ALPHA ); } pLed->bLedScanBlinkInProgress = false;
@@ -651,7 +651,7 @@ static void SwLedBlink5(struct LED_871x *pLed) pLed->BlinkingLedState =RTW_LED_OFF ; else pLed->BlinkingLedState = RTW_LED_ON; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_SCAN_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_SCAN_INTERVAL_ALPHA ); } }break ;
@@ -670,7 +670,7 @@ static void SwLedBlink5(struct LED_871x *pLed) pLed->CurrLedState =RTW_LED_ON ; pLed->BlinkingLedState =RTW_LED_ON ;if (!pLed->bLedOn) -_set_timer (&(pLed->BlinkTimer),LED_BLINK_FASTER_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_FASTER_INTERVAL_ALPHA ); } pLed->bLedBlinkInProgress = false;
@@ -682,7 +682,7 @@ static void SwLedBlink5(struct LED_871x *pLed) pLed->BlinkingLedState =RTW_LED_OFF ; else pLed->BlinkingLedState = RTW_LED_ON; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_FASTER_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_FASTER_INTERVAL_ALPHA ); } }break ;
@@ -706,9 +706,9 @@ static void SwLedBlink6(struct LED_871x *pLed)/* ALPHA, added by chiyoko, 20090106 */ static void SwLedControlMode1 (struct adapter *padapter,enum LED_CTL_MODE LedAction) { -struct led_priv *ledpriv = &(padapter->ledpriv); -struct LED_871x *pLed = &(ledpriv->SwLed0); -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct led_priv *ledpriv = &padapter->ledpriv; +struct LED_871x *pLed = &ledpriv->SwLed0; +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;switch (LedAction) {case LED_CTL_POWER_ON :
@@ -718,11 +718,11 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedActif (pLed->CurrLedState ==LED_BLINK_SCAN ||IS_LED_WPS_BLINKING (pLed))return ;if (pLed->bLedLinkBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedLinkBlinkInProgress = false; }if (pLed->bLedBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedBlinkInProgress = false; }
@@ -732,7 +732,7 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct pLed->BlinkingLedState =RTW_LED_OFF ; else pLed->BlinkingLedState = RTW_LED_ON; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_NO_LINK_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_NO_LINK_INTERVAL_ALPHA ); }break ;case LED_CTL_LINK :
@@ -740,11 +740,11 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedActif (pLed->CurrLedState ==LED_BLINK_SCAN ||IS_LED_WPS_BLINKING (pLed))return ;if (pLed->bLedNoLinkBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedNoLinkBlinkInProgress = false; }if (pLed->bLedBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedBlinkInProgress = false; } pLed->bLedLinkBlinkInProgress = true;
@@ -753,7 +753,7 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct pLed->BlinkingLedState =RTW_LED_OFF ; else pLed->BlinkingLedState = RTW_LED_ON; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_LINK_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_LINK_INTERVAL_ALPHA ); }break ;case LED_CTL_SITE_SURVEY :
@@ -763,15 +763,15 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedActif (IS_LED_WPS_BLINKING (pLed))return ;if (pLed->bLedNoLinkBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedNoLinkBlinkInProgress = false; }if (pLed->bLedLinkBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedLinkBlinkInProgress = false; }if (pLed->bLedBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedBlinkInProgress = false; } pLed->bLedScanBlinkInProgress = true;
@@ -781,7 +781,7 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct pLed->BlinkingLedState =RTW_LED_OFF ; else pLed->BlinkingLedState = RTW_LED_ON; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_SCAN_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_SCAN_INTERVAL_ALPHA ); }break ;case LED_CTL_TX :
@@ -790,11 +790,11 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedActif (pLed->CurrLedState ==LED_BLINK_SCAN ||IS_LED_WPS_BLINKING (pLed))return ;if (pLed->bLedNoLinkBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedNoLinkBlinkInProgress = false; }if (pLed->bLedLinkBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedLinkBlinkInProgress = false; } pLed->bLedBlinkInProgress = true;
@@ -804,26 +804,26 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct pLed->BlinkingLedState =RTW_LED_OFF ; else pLed->BlinkingLedState = RTW_LED_ON; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_FASTER_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_FASTER_INTERVAL_ALPHA ); }break ;case LED_CTL_START_WPS :/* wait until xinpin finish */ case LED_CTL_START_WPS_BOTTON :if (!pLed->bLedWPSBlinkInProgress) {if (pLed->bLedNoLinkBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedNoLinkBlinkInProgress = false; }if (pLed->bLedLinkBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedLinkBlinkInProgress = false; }if (pLed->bLedBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedBlinkInProgress = false; }if (pLed->bLedScanBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedScanBlinkInProgress = false; } pLed->bLedWPSBlinkInProgress = true;
@@ -832,42 +832,42 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct pLed->BlinkingLedState =RTW_LED_OFF ; else pLed->BlinkingLedState = RTW_LED_ON; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_SCAN_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_SCAN_INTERVAL_ALPHA ); }break ;case LED_CTL_STOP_WPS :if (pLed->bLedNoLinkBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedNoLinkBlinkInProgress = false; }if (pLed->bLedLinkBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedLinkBlinkInProgress = false; }if (pLed->bLedBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedBlinkInProgress = false; }if (pLed->bLedScanBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedScanBlinkInProgress = false; }if (pLed->bLedWPSBlinkInProgress) -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer);else pLed->bLedWPSBlinkInProgress = true; pLed->CurrLedState =LED_BLINK_WPS_STOP ;if (pLed->bLedOn) { pLed->BlinkingLedState =RTW_LED_OFF ; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_WPS_SUCESS_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_WPS_SUCESS_INTERVAL_ALPHA ); }else { pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&(pLed->BlinkTimer),0 ); +_set_timer (&pLed->BlinkTimer,0 ); }break ;case LED_CTL_STOP_WPS_FAIL :if (pLed->bLedWPSBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedWPSBlinkInProgress = false; } pLed->bLedNoLinkBlinkInProgress = true;
@@ -876,29 +876,29 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct pLed->BlinkingLedState =RTW_LED_OFF ; else pLed->BlinkingLedState = RTW_LED_ON; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_NO_LINK_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_NO_LINK_INTERVAL_ALPHA );break ;case LED_CTL_POWER_OFF : pLed->CurrLedState =RTW_LED_OFF ; pLed->BlinkingLedState =RTW_LED_OFF ;if (pLed->bLedNoLinkBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedNoLinkBlinkInProgress = false; }if (pLed->bLedLinkBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedLinkBlinkInProgress = false; }if (pLed->bLedBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedBlinkInProgress = false; }if (pLed->bLedWPSBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedWPSBlinkInProgress = false; }if (pLed->bLedScanBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedScanBlinkInProgress = false; }SwLedOff (padapter, pLed);
@@ -911,9 +911,9 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct/* Arcadyan/Sitecom , added by chiyoko, 20090216 */ static void SwLedControlMode2 (struct adapter *padapter,enum LED_CTL_MODE LedAction) { -struct led_priv *ledpriv = &(padapter->ledpriv); +struct led_priv *ledpriv = &padapter->ledpriv;struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct LED_871x *pLed = &(ledpriv->SwLed0); +struct LED_871x *pLed = &ledpriv->SwLed0;switch (LedAction) {case LED_CTL_SITE_SURVEY :
@@ -923,7 +923,7 @@ static void SwLedControlMode2(struct adapter *padapter, enum LED_CTL_MODE LedActreturn ;if (pLed->bLedBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedBlinkInProgress = false; } pLed->bLedScanBlinkInProgress = true;
@@ -933,7 +933,7 @@ static void SwLedControlMode2(struct adapter *padapter, enum LED_CTL_MODE LedAct pLed->BlinkingLedState =RTW_LED_OFF ; else pLed->BlinkingLedState = RTW_LED_ON; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_SCAN_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_SCAN_INTERVAL_ALPHA ); }break ;case LED_CTL_TX :
@@ -948,37 +948,37 @@ static void SwLedControlMode2(struct adapter *padapter, enum LED_CTL_MODE LedAct pLed->BlinkingLedState =RTW_LED_OFF ; else pLed->BlinkingLedState = RTW_LED_ON; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_FASTER_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_FASTER_INTERVAL_ALPHA ); }break ;case LED_CTL_LINK : pLed->CurrLedState =RTW_LED_ON ; pLed->BlinkingLedState =RTW_LED_ON ;if (pLed->bLedBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedBlinkInProgress = false; }if (pLed->bLedScanBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedScanBlinkInProgress = false; } -_set_timer (&(pLed->BlinkTimer),0 ); +_set_timer (&pLed->BlinkTimer,0 );break ;case LED_CTL_START_WPS :/* wait until xinpin finish */ case LED_CTL_START_WPS_BOTTON :if (!pLed->bLedWPSBlinkInProgress) {if (pLed->bLedBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedBlinkInProgress = false; }if (pLed->bLedScanBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedScanBlinkInProgress = false; } pLed->bLedWPSBlinkInProgress = true; pLed->CurrLedState =RTW_LED_ON ; pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&(pLed->BlinkTimer),0 ); +_set_timer (&pLed->BlinkTimer,0 ); }break ;case LED_CTL_STOP_WPS :
@@ -988,7 +988,7 @@ static void SwLedControlMode2(struct adapter *padapter, enum LED_CTL_MODE LedAct }else { pLed->CurrLedState =RTW_LED_ON ; pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&(pLed->BlinkTimer),0 ); +_set_timer (&pLed->BlinkTimer,0 ); }break ;case LED_CTL_STOP_WPS_FAIL :
@@ -998,7 +998,7 @@ static void SwLedControlMode2(struct adapter *padapter, enum LED_CTL_MODE LedAct }else { pLed->CurrLedState =RTW_LED_OFF ; pLed->BlinkingLedState =RTW_LED_OFF ; -_set_timer (&(pLed->BlinkTimer),0 ); +_set_timer (&pLed->BlinkTimer,0 ); }break ;case LED_CTL_START_TO_LINK :
@@ -1006,26 +1006,26 @@ static void SwLedControlMode2(struct adapter *padapter, enum LED_CTL_MODE LedActif (!IS_LED_BLINKING (pLed)) { pLed->CurrLedState =RTW_LED_OFF ; pLed->BlinkingLedState =RTW_LED_OFF ; -_set_timer (&(pLed->BlinkTimer),0 ); +_set_timer (&pLed->BlinkTimer,0 ); }break ;case LED_CTL_POWER_OFF : pLed->CurrLedState =RTW_LED_OFF ; pLed->BlinkingLedState =RTW_LED_OFF ;if (pLed->bLedBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedBlinkInProgress = false; }if (pLed->bLedScanBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedScanBlinkInProgress = false; }if (pLed->bLedWPSBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedWPSBlinkInProgress = false; } -_set_timer (&(pLed->BlinkTimer),0 ); +_set_timer (&pLed->BlinkTimer,0 );break ;default :break ;
@@ -1035,9 +1035,9 @@ static void SwLedControlMode2(struct adapter *padapter, enum LED_CTL_MODE LedAct/* COREGA, added by chiyoko, 20090316 */ static void SwLedControlMode3 (struct adapter *padapter,enum LED_CTL_MODE LedAction) { -struct led_priv *ledpriv = &(padapter->ledpriv); +struct led_priv *ledpriv = &padapter->ledpriv;struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct LED_871x *pLed = &(ledpriv->SwLed0); +struct LED_871x *pLed = &ledpriv->SwLed0;switch (LedAction) {case LED_CTL_SITE_SURVEY :
@@ -1047,7 +1047,7 @@ static void SwLedControlMode2(struct adapter *padapter, enum LED_CTL_MODE LedActreturn ;if (pLed->bLedBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedBlinkInProgress = false; } pLed->bLedScanBlinkInProgress = true;
@@ -1057,7 +1057,7 @@ static void SwLedControlMode2(struct adapter *padapter, enum LED_CTL_MODE LedAct pLed->BlinkingLedState =RTW_LED_OFF ; else pLed->BlinkingLedState = RTW_LED_ON; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_SCAN_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_SCAN_INTERVAL_ALPHA ); }break ;case LED_CTL_TX :
@@ -1072,7 +1072,7 @@ static void SwLedControlMode2(struct adapter *padapter, enum LED_CTL_MODE LedAct pLed->BlinkingLedState =RTW_LED_OFF ; else pLed->BlinkingLedState = RTW_LED_ON; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_FASTER_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_FASTER_INTERVAL_ALPHA ); }break ;case LED_CTL_LINK :
@@ -1081,25 +1081,25 @@ static void SwLedControlMode2(struct adapter *padapter, enum LED_CTL_MODE LedAct pLed->CurrLedState =RTW_LED_ON ; pLed->BlinkingLedState =RTW_LED_ON ;if (pLed->bLedBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedBlinkInProgress = false; }if (pLed->bLedScanBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedScanBlinkInProgress = false; } -_set_timer (&(pLed->BlinkTimer),0 ); +_set_timer (&pLed->BlinkTimer,0 );break ;case LED_CTL_START_WPS :/* wait until xinpin finish */ case LED_CTL_START_WPS_BOTTON :if (!pLed->bLedWPSBlinkInProgress) {if (pLed->bLedBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedBlinkInProgress = false; }if (pLed->bLedScanBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedScanBlinkInProgress = false; } pLed->bLedWPSBlinkInProgress = true;
@@ -1108,12 +1108,12 @@ static void SwLedControlMode2(struct adapter *padapter, enum LED_CTL_MODE LedAct pLed->BlinkingLedState =RTW_LED_OFF ; else pLed->BlinkingLedState = RTW_LED_ON; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_SCAN_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_SCAN_INTERVAL_ALPHA ); }break ;case LED_CTL_STOP_WPS :if (pLed->bLedWPSBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedWPSBlinkInProgress = false; }else { pLed->bLedWPSBlinkInProgress = true;
@@ -1122,46 +1122,46 @@ static void SwLedControlMode2(struct adapter *padapter, enum LED_CTL_MODE LedAct pLed->CurrLedState =LED_BLINK_WPS_STOP ;if (pLed->bLedOn) { pLed->BlinkingLedState =RTW_LED_OFF ; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_WPS_SUCESS_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_WPS_SUCESS_INTERVAL_ALPHA ); }else { pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&(pLed->BlinkTimer),0 ); +_set_timer (&pLed->BlinkTimer,0 ); }break ;case LED_CTL_STOP_WPS_FAIL :if (pLed->bLedWPSBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedWPSBlinkInProgress = false; } pLed->CurrLedState =RTW_LED_OFF ; pLed->BlinkingLedState =RTW_LED_OFF ; -_set_timer (&(pLed->BlinkTimer),0 ); +_set_timer (&pLed->BlinkTimer,0 );break ;case LED_CTL_START_TO_LINK :case LED_CTL_NO_LINK :if (!IS_LED_BLINKING (pLed)) { pLed->CurrLedState =RTW_LED_OFF ; pLed->BlinkingLedState =RTW_LED_OFF ; -_set_timer (&(pLed->BlinkTimer),0 ); +_set_timer (&pLed->BlinkTimer,0 ); }break ;case LED_CTL_POWER_OFF : pLed->CurrLedState =RTW_LED_OFF ; pLed->BlinkingLedState =RTW_LED_OFF ;if (pLed->bLedBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedBlinkInProgress = false; }if (pLed->bLedScanBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedScanBlinkInProgress = false; }if (pLed->bLedWPSBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedWPSBlinkInProgress = false; } -_set_timer (&(pLed->BlinkTimer),0 ); +_set_timer (&pLed->BlinkTimer,0 );break ;default :break ;
@@ -1171,33 +1171,33 @@ static void SwLedControlMode2(struct adapter *padapter, enum LED_CTL_MODE LedAct/* Edimax-Belkin, added by chiyoko, 20090413 */ static void SwLedControlMode4 (struct adapter *padapter,enum LED_CTL_MODE LedAction) { -struct led_priv *ledpriv = &(padapter->ledpriv); +struct led_priv *ledpriv = &padapter->ledpriv;struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct LED_871x *pLed = &(ledpriv->SwLed0); -struct LED_871x *pLed1 = &(ledpriv->SwLed1); +struct LED_871x *pLed = &ledpriv->SwLed0; +struct LED_871x *pLed1 = &ledpriv->SwLed1;switch (LedAction) {case LED_CTL_START_TO_LINK :if (pLed1->bLedWPSBlinkInProgress) { pLed1->bLedWPSBlinkInProgress = false; -_cancel_timer_ex (&(pLed1->BlinkTimer)); +_cancel_timer_ex (&pLed1->BlinkTimer); pLed1->BlinkingLedState =RTW_LED_OFF ; pLed1->CurrLedState =RTW_LED_OFF ;if (pLed1->bLedOn) -_set_timer (&(pLed->BlinkTimer),0 ); +_set_timer (&pLed->BlinkTimer,0 ); }if (!pLed->bLedStartToLinkBlinkInProgress) {if (pLed->CurrLedState ==LED_BLINK_SCAN ||IS_LED_WPS_BLINKING (pLed))return ;if (pLed->bLedBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedBlinkInProgress = false; }if (pLed->bLedNoLinkBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedNoLinkBlinkInProgress = false; }
@@ -1205,10 +1205,10 @@ static void SwLedControlMode4(struct adapter *padapter, enum LED_CTL_MODE LedAct pLed->CurrLedState = LED_BLINK_StartToBlink;if (pLed->bLedOn) { pLed->BlinkingLedState =RTW_LED_OFF ; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_SLOWLY_INTERVAL ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_SLOWLY_INTERVAL ); }else { pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_NORMAL_INTERVAL ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_NORMAL_INTERVAL ); } }break ;
@@ -1218,13 +1218,13 @@ static void SwLedControlMode4(struct adapter *padapter, enum LED_CTL_MODE LedActif (LedAction ==LED_CTL_LINK ) {if (pLed1->bLedWPSBlinkInProgress) { pLed1->bLedWPSBlinkInProgress = false; -_cancel_timer_ex (&(pLed1->BlinkTimer)); +_cancel_timer_ex (&pLed1->BlinkTimer); pLed1->BlinkingLedState =RTW_LED_OFF ; pLed1->CurrLedState =RTW_LED_OFF ;if (pLed1->bLedOn) -_set_timer (&(pLed->BlinkTimer),0 ); +_set_timer (&pLed->BlinkTimer,0 ); } }
@@ -1232,7 +1232,7 @@ static void SwLedControlMode4(struct adapter *padapter, enum LED_CTL_MODE LedActif (pLed->CurrLedState ==LED_BLINK_SCAN ||IS_LED_WPS_BLINKING (pLed))return ;if (pLed->bLedBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedBlinkInProgress = false; }
@@ -1242,7 +1242,7 @@ static void SwLedControlMode4(struct adapter *padapter, enum LED_CTL_MODE LedAct pLed->BlinkingLedState =RTW_LED_OFF ; else pLed->BlinkingLedState = RTW_LED_ON; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_NO_LINK_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_NO_LINK_INTERVAL_ALPHA ); }break ;case LED_CTL_SITE_SURVEY :
@@ -1252,11 +1252,11 @@ static void SwLedControlMode4(struct adapter *padapter, enum LED_CTL_MODE LedActreturn ;if (pLed->bLedNoLinkBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedNoLinkBlinkInProgress = false; }if (pLed->bLedBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedBlinkInProgress = false; } pLed->bLedScanBlinkInProgress = true;
@@ -1266,7 +1266,7 @@ static void SwLedControlMode4(struct adapter *padapter, enum LED_CTL_MODE LedAct pLed->BlinkingLedState =RTW_LED_OFF ; else pLed->BlinkingLedState = RTW_LED_ON; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_SCAN_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_SCAN_INTERVAL_ALPHA ); }break ;case LED_CTL_TX :
@@ -1275,7 +1275,7 @@ static void SwLedControlMode4(struct adapter *padapter, enum LED_CTL_MODE LedActif (pLed->CurrLedState ==LED_BLINK_SCAN ||IS_LED_WPS_BLINKING (pLed))return ;if (pLed->bLedNoLinkBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedNoLinkBlinkInProgress = false; } pLed->bLedBlinkInProgress = true;
@@ -1285,49 +1285,49 @@ static void SwLedControlMode4(struct adapter *padapter, enum LED_CTL_MODE LedAct pLed->BlinkingLedState =RTW_LED_OFF ; else pLed->BlinkingLedState = RTW_LED_ON; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_FASTER_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_FASTER_INTERVAL_ALPHA ); }break ;case LED_CTL_START_WPS :/* wait until xinpin finish */ case LED_CTL_START_WPS_BOTTON :if (pLed1->bLedWPSBlinkInProgress) { pLed1->bLedWPSBlinkInProgress = false; -_cancel_timer_ex (&(pLed1->BlinkTimer)); +_cancel_timer_ex (&pLed1->BlinkTimer); pLed1->BlinkingLedState =RTW_LED_OFF ; pLed1->CurrLedState =RTW_LED_OFF ;if (pLed1->bLedOn) -_set_timer (&(pLed->BlinkTimer),0 ); +_set_timer (&pLed->BlinkTimer,0 ); }if (!pLed->bLedWPSBlinkInProgress) {if (pLed->bLedNoLinkBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedNoLinkBlinkInProgress = false; }if (pLed->bLedBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedBlinkInProgress = false; }if (pLed->bLedScanBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedScanBlinkInProgress = false; } pLed->bLedWPSBlinkInProgress = true; pLed->CurrLedState =LED_BLINK_WPS ;if (pLed->bLedOn) { pLed->BlinkingLedState =RTW_LED_OFF ; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_SLOWLY_INTERVAL ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_SLOWLY_INTERVAL ); }else { pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_NORMAL_INTERVAL ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_NORMAL_INTERVAL ); } }break ;case LED_CTL_STOP_WPS :/* WPS connect success */ if (pLed->bLedWPSBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedWPSBlinkInProgress = false; }
@@ -1337,12 +1337,12 @@ static void SwLedControlMode4(struct adapter *padapter, enum LED_CTL_MODE LedAct pLed->BlinkingLedState =RTW_LED_OFF ; else pLed->BlinkingLedState = RTW_LED_ON; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_NO_LINK_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_NO_LINK_INTERVAL_ALPHA );break ;case LED_CTL_STOP_WPS_FAIL :/* WPS authentication fail */ if (pLed->bLedWPSBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedWPSBlinkInProgress = false; } pLed->bLedNoLinkBlinkInProgress = true;
@@ -1351,11 +1351,11 @@ static void SwLedControlMode4(struct adapter *padapter, enum LED_CTL_MODE LedAct pLed->BlinkingLedState =RTW_LED_OFF ; else pLed->BlinkingLedState = RTW_LED_ON; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_NO_LINK_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_NO_LINK_INTERVAL_ALPHA );/* LED1 settings */ if (pLed1->bLedWPSBlinkInProgress) -_cancel_timer_ex (&(pLed1->BlinkTimer)); +_cancel_timer_ex (&pLed1->BlinkTimer);else pLed1->bLedWPSBlinkInProgress = true; pLed1->CurrLedState =LED_BLINK_WPS_STOP ;
@@ -1363,11 +1363,11 @@ static void SwLedControlMode4(struct adapter *padapter, enum LED_CTL_MODE LedAct pLed1->BlinkingLedState =RTW_LED_OFF ; else pLed1->BlinkingLedState = RTW_LED_ON; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_NORMAL_INTERVAL ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_NORMAL_INTERVAL );break ;case LED_CTL_STOP_WPS_FAIL_OVERLAP :/* WPS session overlap */ if (pLed->bLedWPSBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedWPSBlinkInProgress = false; } pLed->bLedNoLinkBlinkInProgress = true;
@@ -1376,11 +1376,11 @@ static void SwLedControlMode4(struct adapter *padapter, enum LED_CTL_MODE LedAct pLed->BlinkingLedState =RTW_LED_OFF ; else pLed->BlinkingLedState = RTW_LED_ON; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_NO_LINK_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_NO_LINK_INTERVAL_ALPHA );/* LED1 settings */ if (pLed1->bLedWPSBlinkInProgress) -_cancel_timer_ex (&(pLed1->BlinkTimer)); +_cancel_timer_ex (&pLed1->BlinkTimer);else pLed1->bLedWPSBlinkInProgress = true; pLed1->CurrLedState =LED_BLINK_WPS_STOP_OVERLAP ;
@@ -1389,38 +1389,38 @@ static void SwLedControlMode4(struct adapter *padapter, enum LED_CTL_MODE LedAct pLed1->BlinkingLedState =RTW_LED_OFF ; else pLed1->BlinkingLedState = RTW_LED_ON; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_NORMAL_INTERVAL ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_NORMAL_INTERVAL );break ;case LED_CTL_POWER_OFF : pLed->CurrLedState =RTW_LED_OFF ; pLed->BlinkingLedState =RTW_LED_OFF ;if (pLed->bLedNoLinkBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedNoLinkBlinkInProgress = false; }if (pLed->bLedLinkBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedLinkBlinkInProgress = false; }if (pLed->bLedBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedBlinkInProgress = false; }if (pLed->bLedWPSBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedWPSBlinkInProgress = false; }if (pLed->bLedScanBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedScanBlinkInProgress = false; }if (pLed->bLedStartToLinkBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedStartToLinkBlinkInProgress = false; }if (pLed1->bLedWPSBlinkInProgress) { -_cancel_timer_ex (&(pLed1->BlinkTimer)); +_cancel_timer_ex (&pLed1->BlinkTimer); pLed1->bLedWPSBlinkInProgress = false; } pLed1->BlinkingLedState =LED_UNKNOWN ;
@@ -1439,9 +1439,9 @@ SwLedControlMode5(enum LED_CTL_MODE LedAction ) { -struct led_priv *ledpriv = &(padapter->ledpriv); +struct led_priv *ledpriv = &padapter->ledpriv;struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct LED_871x *pLed = &(ledpriv->SwLed0); +struct LED_871x *pLed = &ledpriv->SwLed0;switch (LedAction) {case LED_CTL_POWER_ON :
@@ -1450,13 +1450,13 @@ SwLedControlMode5( pLed->CurrLedState =RTW_LED_ON ; pLed->BlinkingLedState =RTW_LED_ON ; -_set_timer (&(pLed->BlinkTimer),0 ); +_set_timer (&pLed->BlinkTimer,0 );break ;case LED_CTL_SITE_SURVEY :if ((pmlmepriv->LinkDetectInfo.bBusyTraffic) && (check_fwstate (pmlmepriv, _FW_LINKED))) { }else if (!pLed->bLedScanBlinkInProgress) {if (pLed->bLedBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedBlinkInProgress = false; } pLed->bLedScanBlinkInProgress = true;
@@ -1466,7 +1466,7 @@ SwLedControlMode5( pLed->BlinkingLedState =RTW_LED_OFF ; else pLed->BlinkingLedState = RTW_LED_ON; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_SCAN_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_SCAN_INTERVAL_ALPHA ); }break ;case LED_CTL_TX :
@@ -1481,7 +1481,7 @@ SwLedControlMode5( pLed->BlinkingLedState =RTW_LED_OFF ; else pLed->BlinkingLedState = RTW_LED_ON; -_set_timer (&(pLed->BlinkTimer),LED_BLINK_FASTER_INTERVAL_ALPHA ); +_set_timer (&pLed->BlinkTimer,LED_BLINK_FASTER_INTERVAL_ALPHA ); }break ;case LED_CTL_POWER_OFF :
@@ -1489,7 +1489,7 @@ SwLedControlMode5( pLed->BlinkingLedState =RTW_LED_OFF ;if (pLed->bLedBlinkInProgress) { -_cancel_timer_ex (&(pLed->BlinkTimer)); +_cancel_timer_ex (&pLed->BlinkTimer); pLed->bLedBlinkInProgress = false; }SwLedOff (padapter, pLed);
@@ -1506,17 +1506,17 @@ SwLedControlMode6(enum LED_CTL_MODE LedAction ) { -struct led_priv *ledpriv = &(padapter->ledpriv); -struct LED_871x *pLed0 = &(ledpriv->SwLed0); +struct led_priv *ledpriv = &padapter->ledpriv; +struct LED_871x *pLed0 = &ledpriv->SwLed0;switch (LedAction) {case LED_CTL_POWER_ON :case LED_CTL_LINK :case LED_CTL_NO_LINK : -_cancel_timer_ex (&(pLed0->BlinkTimer)); +_cancel_timer_ex (&pLed0->BlinkTimer); pLed0->CurrLedState =RTW_LED_ON ; pLed0->BlinkingLedState =RTW_LED_ON ; -_set_timer (&(pLed0->BlinkTimer),0 ); +_set_timer (&pLed0->BlinkTimer,0 );break ;case LED_CTL_POWER_OFF :SwLedOff (padapter, pLed0);
@@ -1534,7 +1534,7 @@ SwLedControlMode6(void BlinkHandler (struct LED_871x *pLed) {struct adapter *padapter = pLed->padapter; -struct led_priv *ledpriv = &(padapter->ledpriv); +struct led_priv *ledpriv = &padapter->ledpriv;if ((padapter->bSurpriseRemoved) || (padapter->bDriverStopped))return ;
@@ -1568,7 +1568,7 @@ void BlinkHandler(struct LED_871x *pLed)void LedControl8188eu (struct adapter *padapter,enum LED_CTL_MODE LedAction) { -struct led_priv *ledpriv = &(padapter->ledpriv); +struct led_priv *ledpriv = &padapter->ledpriv;struct registry_priv *registry_par; if ((padapter->bSurpriseRemoved) || (padapter->bDriverStopped) ||
Signature · 1 line
2.32.0
PATCH 7/17 staging: r8188eu: remove unnecessary parentheses in core/rtw_p2p.c
In reply to Michael StraubeRemove unnecessary parentheses in core/rtw_p2p.c reported by checkpatch.
--- drivers/staging/r8188eu/core/rtw_p2p.c | 78 +++++++++++++------------- 1 file changed, 39 insertions(+), 39 deletions(-)
drivers/staging/r8188eu/core/rtw_p2p.c +39 -39
@@ -118,8 +118,8 @@ static void issue_group_disc_req(struct wifidirect_info *pwdinfo, u8 *da)struct rtw_ieee80211_hdr *pwlanhdr;__le16 *fctrl;struct adapter *padapter = pwdinfo->padapter; -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); +struct xmit_priv *pxmitpriv = &padapter->xmitpriv; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;unsigned char category =RTW_WLAN_CATEGORY_P2P ;/* P2P action frame */ __be32 p2poui =cpu_to_be32 (P2POUI );u8 oui_subtype =P2P_GO_DISC_REQUEST ;
@@ -140,7 +140,7 @@ static void issue_group_disc_req(struct wifidirect_info *pwdinfo, u8 *da) pframe = (u8 *)(pmgntframe->buf_addr) +TXDESC_OFFSET ; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; - fctrl = &(pwlanhdr->frame_ctl); + fctrl = &pwlanhdr->frame_ctl; *(fctrl) =0 ;memcpy (pwlanhdr->addr1, da,ETH_ALEN );
@@ -155,10 +155,10 @@ static void issue_group_disc_req(struct wifidirect_info *pwdinfo, u8 *da) pattrib->pktlen =sizeof (struct rtw_ieee80211_hdr_3addr );/* Build P2P action frame header */ - pframe =rtw_set_fixed_ie (pframe,1 , &(category), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,4 , (unsigned char *)&(p2poui), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,1 , &(oui_subtype), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,1 , &(dialogToken), &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe,1 , &(category), &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,4 , (unsigned char *)&(p2poui), &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,1 , &(oui_subtype), &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,1 , &(dialogToken), &pattrib->pktlen);/* there is no IE in this P2P action frame */
@@ -175,8 +175,8 @@ static void issue_p2p_devdisc_resp(struct wifidirect_info *pwdinfo, u8 *da, u8 sstruct rtw_ieee80211_hdr *pwlanhdr;__le16 *fctrl;struct adapter *padapter = pwdinfo->padapter; -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); +struct xmit_priv *pxmitpriv = &padapter->xmitpriv; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;unsigned char category =RTW_WLAN_CATEGORY_PUBLIC ;u8 action =P2P_PUB_ACTION_ACTION ;__be32 p2poui =cpu_to_be32 (P2POUI );
@@ -199,7 +199,7 @@ static void issue_p2p_devdisc_resp(struct wifidirect_info *pwdinfo, u8 *da, u8 s pframe = (u8 *)(pmgntframe->buf_addr) +TXDESC_OFFSET ; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; - fctrl = &(pwlanhdr->frame_ctl); + fctrl = &pwlanhdr->frame_ctl; *(fctrl) =0 ;memcpy (pwlanhdr->addr1, da,ETH_ALEN );
@@ -214,11 +214,11 @@ static void issue_p2p_devdisc_resp(struct wifidirect_info *pwdinfo, u8 *da, u8 s pattrib->pktlen =sizeof (struct rtw_ieee80211_hdr_3addr );/* Build P2P public action frame header */ - pframe =rtw_set_fixed_ie (pframe,1 , &(category), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,1 , &(action), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,4 , (unsigned char *)&(p2poui), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,1 , &(oui_subtype), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,1 , &(dialogToken), &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe,1 , &(category), &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,1 , &(action), &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,4 , (unsigned char *)&(p2poui), &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,1 , &(oui_subtype), &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,1 , &(dialogToken), &pattrib->pktlen);/* Build P2P IE */ /* P2P OUI */
@@ -253,8 +253,8 @@ static void issue_p2p_provision_resp(struct wifidirect_info *pwdinfo, u8 *raddr,unsigned char *pframe;struct rtw_ieee80211_hdr *pwlanhdr;__le16 *fctrl; -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); +struct xmit_priv *pxmitpriv = &padapter->xmitpriv; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; pmgntframe =alloc_mgtxmitframe (pxmitpriv);if (!pmgntframe)
@@ -269,12 +269,12 @@ static void issue_p2p_provision_resp(struct wifidirect_info *pwdinfo, u8 *raddr, pframe = (u8 *)(pmgntframe->buf_addr) +TXDESC_OFFSET ; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; - fctrl = &(pwlanhdr->frame_ctl); + fctrl = &pwlanhdr->frame_ctl; *(fctrl) =0 ;memcpy (pwlanhdr->addr1, raddr,ETH_ALEN ); -memcpy (pwlanhdr->addr2,myid (&(padapter->eeprompriv)),ETH_ALEN ); -memcpy (pwlanhdr->addr3,myid (&(padapter->eeprompriv)),ETH_ALEN ); +memcpy (pwlanhdr->addr2,myid (&padapter->eeprompriv),ETH_ALEN ); +memcpy (pwlanhdr->addr3,myid (&padapter->eeprompriv),ETH_ALEN );SetSeqNum (pwlanhdr, pmlmeext->mgnt_seq); pmlmeext->mgnt_seq++;
@@ -283,11 +283,11 @@ static void issue_p2p_provision_resp(struct wifidirect_info *pwdinfo, u8 *raddr, pframe +=sizeof (struct rtw_ieee80211_hdr_3addr ); pattrib->pktlen =sizeof (struct rtw_ieee80211_hdr_3addr ); - pframe =rtw_set_fixed_ie (pframe,1 , &(category), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,1 , &(action), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,4 , (unsigned char *)&(p2poui), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,1 , &(oui_subtype), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,1 , &(dialogToken), &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe,1 , &(category), &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,1 , &(action), &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,4 , (unsigned char *)&(p2poui), &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,1 , &(oui_subtype), &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,1 , &(dialogToken), &pattrib->pktlen); wpsielen =0 ;/* WPS OUI */
@@ -322,8 +322,8 @@ static void issue_p2p_presence_resp(struct wifidirect_info *pwdinfo, u8 *da, u8struct rtw_ieee80211_hdr *pwlanhdr;__le16 *fctrl;struct adapter *padapter = pwdinfo->padapter; -struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); +struct xmit_priv *pxmitpriv = &padapter->xmitpriv; +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;unsigned char category =RTW_WLAN_CATEGORY_P2P ;/* P2P action frame */ __be32 p2poui =cpu_to_be32 (P2POUI );u8 oui_subtype =P2P_PRESENCE_RESPONSE ;
@@ -346,7 +346,7 @@ static void issue_p2p_presence_resp(struct wifidirect_info *pwdinfo, u8 *da, u8 pframe = (u8 *)(pmgntframe->buf_addr) +TXDESC_OFFSET ; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; - fctrl = &(pwlanhdr->frame_ctl); + fctrl = &pwlanhdr->frame_ctl; *(fctrl) =0 ;memcpy (pwlanhdr->addr1, da,ETH_ALEN );
@@ -361,10 +361,10 @@ static void issue_p2p_presence_resp(struct wifidirect_info *pwdinfo, u8 *da, u8 pattrib->pktlen =sizeof (struct rtw_ieee80211_hdr_3addr );/* Build P2P action frame header */ - pframe =rtw_set_fixed_ie (pframe,1 , &(category), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,4 , (unsigned char *)&(p2poui), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,1 , &(oui_subtype), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,1 , &(dialogToken), &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe,1 , &(category), &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,4 , (unsigned char *)&(p2poui), &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,1 , &(oui_subtype), &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,1 , &(dialogToken), &pattrib->pktlen);/* Add P2P IE header */ /* P2P OUI */
@@ -385,7 +385,7 @@ static void issue_p2p_presence_resp(struct wifidirect_info *pwdinfo, u8 *da, u8 p2pielen +=rtw_set_p2p_attr_content (&p2pie[p2pielen],P2P_ATTR_NOA ,2 , noa_attr_content); - pframe =rtw_set_ie (pframe, _VENDOR_SPECIFIC_IE_, p2pielen, p2pie, &(pattrib->pktlen)); + pframe =rtw_set_ie (pframe, _VENDOR_SPECIFIC_IE_, p2pielen, p2pie, &pattrib->pktlen); pattrib->last_txcmdsz = pattrib->pktlen;
@@ -1556,7 +1556,7 @@ void process_p2p_ps_ie(struct adapter *padapter, u8 *IEs, u32 IELength)u8 noa_attr[MAX_P2P_IE_LEN ] = {0x00 };/* NoA length should be n*(13) + 2 */ u32 attr_contentlen =0 ; -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct wifidirect_info *pwdinfo = &padapter->wdinfo;u8 find_p2p = false, find_p2p_ps = false;u8 noa_offset, noa_num, noa_index;
@@ -1636,7 +1636,7 @@ void process_p2p_ps_ie(struct adapter *padapter, u8 *IEs, u32 IELength)void p2p_ps_wk_hdl (struct adapter *padapter,u8 p2p_ps_state) {struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct wifidirect_info *pwdinfo = &padapter->wdinfo;/* Pre action for p2p state */ switch (p2p_ps_state) {
@@ -1653,7 +1653,7 @@ void p2p_ps_wk_hdl(struct adapter *padapter, u8 p2p_ps_state)if (padapter->pwrctrlpriv.bFwCurrentInPSMode) {if (pwrpriv->smart_ps ==0 ) { pwrpriv->smart_ps =2 ; -rtw_hal_set_hwreg (padapter,HW_VAR_H2C_FW_PWRMODE , (u8 *)(&(padapter->pwrctrlpriv.pwr_mode))); +rtw_hal_set_hwreg (padapter,HW_VAR_H2C_FW_PWRMODE , (u8 *)(&padapter->pwrctrlpriv.pwr_mode)); } }break ;
@@ -1665,7 +1665,7 @@ void p2p_ps_wk_hdl(struct adapter *padapter, u8 p2p_ps_state)if (pwrpriv->smart_ps !=0 ) { pwrpriv->smart_ps =0 ;DBG_88E ("%s(): Enter CTW, change SmartPS\n" , __func__); -rtw_hal_set_hwreg (padapter,HW_VAR_H2C_FW_PWRMODE , (u8 *)(&(padapter->pwrctrlpriv.pwr_mode))); +rtw_hal_set_hwreg (padapter,HW_VAR_H2C_FW_PWRMODE , (u8 *)(&padapter->pwrctrlpriv.pwr_mode)); } }rtw_hal_set_hwreg (padapter,HW_VAR_H2C_FW_P2P_PS_OFFLOAD , (u8 *)(&p2p_ps_state));
@@ -1689,7 +1689,7 @@ u8 p2p_ps_wk_cmd(struct adapter *padapter, u8 p2p_ps_state, u8 enqueue) {struct cmd_obj *ph2c;struct drvextra_cmd_parm *pdrvextra_cmd_parm; -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct wifidirect_info *pwdinfo = &padapter->wdinfo;struct cmd_priv *pcmdpriv = &padapter->cmdpriv;u8 res = _SUCCESS;
@@ -1938,7 +1938,7 @@ void init_wifidirect_info(struct adapter *padapter, enum P2P_ROLE role)int rtw_p2p_enable (struct adapter *padapter,enum P2P_ROLE role) {int ret = _SUCCESS; -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct wifidirect_info *pwdinfo = &padapter->wdinfo;if (role ==P2P_ROLE_DEVICE || role ==P2P_ROLE_CLIENT || role ==P2P_ROLE_GO ) {/* leave IPS/Autosuspend */
Signature · 1 line
2.32.0
Re: [PATCH 07/17] staging: r8188eu: remove unnecessary parentheses in core/rtw_p2p.c
drivers/staging/r8188eu/core/rtw_p2p.c static void issue_group_disc_req(struct wifidirect_info *pwdinfo, u8 *da) · line 161
Quoted 12 lines · Michael Straube
drivers/staging/r8188eu/core/rtw_p2p.c +4
-4@@ -155,10 +155,10 @@ static void issue_group_disc_req(struct wifidirect_info *pwdinfo, u8 *da) pattrib->pktlen =sizeof (struct rtw_ieee80211_hdr_3addr );/* Build P2P action frame header */ - pframe =rtw_set_fixed_ie (pframe,1 , &(category), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,4 , (unsigned char *)&(p2poui), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,1 , &(oui_subtype), &(pattrib->pktlen)); - pframe =rtw_set_fixed_ie (pframe,1 , &(dialogToken), &(pattrib->pktlen)); + pframe =rtw_set_fixed_ie (pframe,1 , &(category), &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,4 , (unsigned char *)&(p2poui), &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,1 , &(oui_subtype), &pattrib->pktlen); + pframe =rtw_set_fixed_ie (pframe,1 , &(dialogToken), &pattrib->pktlen);
Same thing as the earlier patch. Only the fourth parameter is fixed and not the others.
regards,
dan carpenter
PATCH 8/17 staging: r8188eu: clean up comparsions to true/false
In reply to Michael StraubeClean up some comparsions to true/false to clear chackpatch warnings.
WARNING: Unnecessary parentheses - maybe == should be = ?
--- drivers/staging/r8188eu/core/rtw_ioctl_set.c | 4 ++-- drivers/staging/r8188eu/core/rtw_mlme.c | 2 +- drivers/staging/r8188eu/core/rtw_xmit.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
drivers/staging/r8188eu/core/rtw_ioctl_set.c +2 -2
@@ -166,7 +166,7 @@ u8 rtw_set_802_11_bssid(struct adapter *padapter, u8 *bssid)rtw_free_assoc_resources (padapter,1 ); -if ((check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true)) { +if (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE )) {_clr_fwstate_ (pmlmepriv,WIFI_ADHOC_MASTER_STATE );set_fwstate (pmlmepriv,WIFI_ADHOC_STATE ); }
@@ -231,7 +231,7 @@ u8 rtw_set_802_11_ssid(struct adapter *padapter, struct ndis_802_11_ssid *ssid)if (check_fwstate (pmlmepriv, _FW_LINKED|WIFI_ADHOC_MASTER_STATE )) {if ((pmlmepriv->assoc_ssid.SsidLength == ssid->SsidLength) && (!memcmp (&pmlmepriv->assoc_ssid.Ssid, ssid->Ssid, ssid->SsidLength))) { -if ((check_fwstate (pmlmepriv,WIFI_STATION_STATE ) == false)) { +if (!check_fwstate (pmlmepriv,WIFI_STATION_STATE )) {if (!rtw_is_same_ibss (padapter, pnetwork)) {/* if in WIFI_ADHOC_MASTER_STATE | WIFI_ADHOC_STATE, create bss or rejoin again */ rtw_disassoc_cmd (padapter,0 , true);
drivers/staging/r8188eu/core/rtw_mlme.c +1 -1
@@ -748,7 +748,7 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)rtw_set_signal_stat_timer (&adapter->recvpriv);if (pmlmepriv->to_join) { -if ((check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true)) { +if (check_fwstate (pmlmepriv,WIFI_ADHOC_STATE )) {if (check_fwstate (pmlmepriv, _FW_LINKED) == false) {set_fwstate (pmlmepriv, _FW_UNDER_LINKING);
drivers/staging/r8188eu/core/rtw_xmit.c +1 -1
@@ -740,7 +740,7 @@ s32 rtw_make_wlanhdr (struct adapter *padapter, u8 *hdr, struct pkt_attrib *pattSetFrameSubType (fctrl, pattrib->subtype);if (pattrib->subtype &WIFI_DATA_TYPE ) { -if ((check_fwstate (pmlmepriv,WIFI_STATION_STATE ) == true)) { +if (check_fwstate (pmlmepriv,WIFI_STATION_STATE )) {/* to_ds = 1, fr_ds = 0; */ /* Data transfer to AP */ SetToDs (fctrl);
Signature · 1 line
2.32.0
PATCH 9/17 staging: r8188eu: remove unnecessary parentheses in core/rtw_mlme.c
In reply to Michael StraubeRemove unnecessary parentheses in core/rtw_mlme.c reported by checkpatch.
--- drivers/staging/r8188eu/core/rtw_mlme.c | 108 ++++++++++++------------ 1 file changed, 54 insertions(+), 54 deletions(-)
drivers/staging/r8188eu/core/rtw_mlme.c +54 -54
@@ -48,9 +48,9 @@ int _rtw_init_mlme_priv (struct adapter *padapter) pmlmepriv->cur_network.network.InfrastructureMode = Ndis802_11AutoUnknown; pmlmepriv->scan_mode =SCAN_ACTIVE ;/* 1: active, 0: pasive. Maybe someday we should rename this varable to "active_mode" (Jeff) */ -spin_lock_init (&(pmlmepriv->lock)); -_rtw_init_queue (&(pmlmepriv->free_bss_pool)); -_rtw_init_queue (&(pmlmepriv->scanned_queue)); +spin_lock_init (&pmlmepriv->lock); +_rtw_init_queue (&pmlmepriv->free_bss_pool); +_rtw_init_queue (&pmlmepriv->scanned_queue);set_scanned_network_val (pmlmepriv,0 );
@@ -67,9 +67,9 @@ int _rtw_init_mlme_priv (struct adapter *padapter) pnetwork = (struct wlan_network *)pbuf;for (i =0 ; i <MAX_BSS_CNT ; i++) { -INIT_LIST_HEAD (&(pnetwork->list)); +INIT_LIST_HEAD (&pnetwork->list); -list_add_tail (&(pnetwork->list), &(pmlmepriv->free_bss_pool.queue)); +list_add_tail (&pnetwork->list, &pmlmepriv->free_bss_pool.queue); pnetwork++; }
@@ -159,7 +159,7 @@ struct wlan_network *_rtw_dequeue_network(struct __queue *queue) }else { pnetwork = container_of((&queue->queue)->next, struct wlan_network, list); -list_del_init (&(pnetwork->list)); +list_del_init (&pnetwork->list); }spin_unlock_bh (&queue->lock);
@@ -179,7 +179,7 @@ struct wlan_network *_rtw_alloc_network(struct mlme_priv *pmlmepriv)/* _queue *f pnetwork =NULL ; goto exit; } - plist = (&(free_queue->queue))->next; + plist = (&free_queue->queue)->next; pnetwork = container_of(plist, struct wlan_network, list);
@@ -203,7 +203,7 @@ void _rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwor {u32 curr_time, delta_time;u32 lifetime =SCANQUEUE_LIFETIME ; -struct __queue *free_queue = &(pmlmepriv->free_bss_pool); +struct __queue *free_queue = &pmlmepriv->free_bss_pool;if (!pnetwork)return ;
@@ -220,22 +220,22 @@ void _rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetworreturn ; }spin_lock_bh (&free_queue->lock); -list_del_init (&(pnetwork->list)); -list_add_tail (&(pnetwork->list), &(free_queue->queue)); +list_del_init (&pnetwork->list); +list_add_tail (&pnetwork->list, &free_queue->queue); pmlmepriv->num_of_scanned--;spin_unlock_bh (&free_queue->lock); }void _rtw_free_network_nolock (struct mlme_priv *pmlmepriv,struct wlan_network *pnetwork) { -struct __queue *free_queue = &(pmlmepriv->free_bss_pool); +struct __queue *free_queue = &pmlmepriv->free_bss_pool;if (!pnetwork)return ;if (pnetwork->fixed)return ; -list_del_init (&(pnetwork->list)); -list_add_tail (&(pnetwork->list),get_list_head (free_queue)); +list_del_init (&pnetwork->list); +list_add_tail (&pnetwork->list,get_list_head (free_queue)); pmlmepriv->num_of_scanned--; }
@@ -473,7 +473,7 @@ void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src,rtw_hal_antdiv_rssi_compared (padapter, dst, src);/* this will update src.Rssi, need consider again */ /* The rule below is 1/5 for sample value, 4/5 for history value */ -if (check_fwstate (&padapter->mlmepriv, _FW_LINKED) &&is_same_network (&(padapter->mlmepriv.cur_network.network), src)) { +if (check_fwstate (&padapter->mlmepriv, _FW_LINKED) &&is_same_network (&padapter->mlmepriv.cur_network.network, src)) {/* Take the recvpriv's value for the connected AP*/ ss_final = padapter->recvpriv.signal_strength; sq_final = padapter->recvpriv.signal_qual;
@@ -507,11 +507,11 @@ void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src,static void update_current_network (struct adapter *adapter,struct wlan_bssid_ex *pnetwork) { -struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); +struct mlme_priv *pmlmepriv = &adapter->mlmepriv;if ((check_fwstate (pmlmepriv, _FW_LINKED) == true) && - (is_same_network (&(pmlmepriv->cur_network.network), pnetwork))) { -update_network (&(pmlmepriv->cur_network.network), pnetwork, adapter, true); + (is_same_network (&pmlmepriv->cur_network.network, pnetwork))) { +update_network (&pmlmepriv->cur_network.network, pnetwork, adapter, true);rtw_update_protection (adapter, (pmlmepriv->cur_network.network.IEs) +sizeof (struct ndis_802_11_fixed_ie ), pmlmepriv->cur_network.network.IELength); }
@@ -525,8 +525,8 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t {struct list_head *plist, *phead;u32 bssid_ex_sz; -struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); -struct __queue *queue = &(pmlmepriv->scanned_queue); +struct mlme_priv *pmlmepriv = &adapter->mlmepriv; +struct __queue *queue = &pmlmepriv->scanned_queue;struct wlan_network *pnetwork =NULL ;struct wlan_network *oldest =NULL ;
@@ -537,7 +537,7 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *twhile (phead != plist) { pnetwork = container_of(plist, struct wlan_network, list); -if (is_same_network (&(pnetwork->network), target)) +if (is_same_network (&pnetwork->network, target))break ;if ((oldest == ((struct wlan_network *)0 )) ||time_after (oldest->last_scanned, pnetwork->last_scanned))
@@ -547,12 +547,12 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t/* If we didn't find a match, then get a new network slot to initialize * with this beacon's information */ if (phead == plist) { -if (list_empty (&(pmlmepriv->free_bss_pool.queue))) { +if (list_empty (&pmlmepriv->free_bss_pool.queue)) {/* If there are no more slots, expire the oldest */ pnetwork = oldest; -rtw_hal_get_def_var (adapter,HAL_DEF_CURRENT_ANTENNA , &(target->PhyInfo.Optimum_antenna)); -memcpy (&(pnetwork->network), target,get_wlan_bssid_ex_sz (target)); +rtw_hal_get_def_var (adapter,HAL_DEF_CURRENT_ANTENNA , &target->PhyInfo.Optimum_antenna); +memcpy (&pnetwork->network, target,get_wlan_bssid_ex_sz (target));/* variable initialize */ pnetwork->fixed = false; pnetwork->last_scanned = jiffies;
@@ -574,15 +574,15 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t bssid_ex_sz =get_wlan_bssid_ex_sz (target); target->Length = bssid_ex_sz; -rtw_hal_get_def_var (adapter,HAL_DEF_CURRENT_ANTENNA , &(target->PhyInfo.Optimum_antenna)); -memcpy (&(pnetwork->network), target, bssid_ex_sz); +rtw_hal_get_def_var (adapter,HAL_DEF_CURRENT_ANTENNA , &target->PhyInfo.Optimum_antenna); +memcpy (&pnetwork->network, target, bssid_ex_sz); pnetwork->last_scanned = jiffies;/* bss info not receiving from the right channel */ if (pnetwork->network.PhyInfo.SignalQuality ==101 ) pnetwork->network.PhyInfo.SignalQuality =0 ; -list_add_tail (&(pnetwork->list), &(queue->queue)); +list_add_tail (&pnetwork->list, &queue->queue); } }else {/* we have an entry and we are going to update it. But this entry may
@@ -600,7 +600,7 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t update_ie = true; else update_ie = false; -update_network (&(pnetwork->network), target, adapter, update_ie); +update_network (&pnetwork->network, target, adapter, update_ie); } exit:
@@ -682,7 +682,7 @@ void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf) {u32 len;struct wlan_bssid_ex *pnetwork; -struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); +struct mlme_priv *pmlmepriv = &adapter->mlmepriv; pnetwork = (struct wlan_bssid_ex *)pbuf;
@@ -693,7 +693,7 @@ void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf)/* update IBSS_network 's timestamp */ if ((check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE )) == true) { -if (!memcmp (&(pmlmepriv->cur_network.network.MacAddress), pnetwork->MacAddress,ETH_ALEN )) { +if (!memcmp (&pmlmepriv->cur_network.network.MacAddress, pnetwork->MacAddress,ETH_ALEN )) {struct wlan_network *ibss_wlan =NULL ;memcpy (pmlmepriv->cur_network.network.IEs, pnetwork->IEs,8 );
@@ -704,7 +704,7 @@ void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf)spin_unlock_bh (&pmlmepriv->scanned_queue.lock); goto exit; } -spin_unlock_bh (&(pmlmepriv->scanned_queue.lock)); +spin_unlock_bh (&pmlmepriv->scanned_queue.lock); } }
@@ -722,7 +722,7 @@ void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf)void rtw_surveydone_event_callback (struct adapter *adapter,u8 *pbuf) { -struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); +struct mlme_priv *pmlmepriv = &adapter->mlmepriv;u8 timer_cancelled =0 ;spin_lock_bh (&pmlmepriv->lock);
@@ -755,7 +755,7 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)if (rtw_select_and_join_from_scanned_queue (pmlmepriv) == _SUCCESS) {_set_timer (&pmlmepriv->assoc_timer,MAX_JOIN_TIMEOUT ); }else { -struct wlan_bssid_ex *pdev_network = &(adapter->registrypriv.dev_network); +struct wlan_bssid_ex *pdev_network = &adapter->registrypriv.dev_network;u8 *pibss = adapter->registrypriv.dev_network.MacAddress;_clr_fwstate_ (pmlmepriv, _FW_UNDER_SURVEY);
@@ -949,8 +949,8 @@ inline void rtw_indicate_scan_done(struct adapter *padapter, bool aborted)void rtw_scan_abort (struct adapter *adapter) {u32 start; -struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); -struct mlme_ext_priv *pmlmeext = &(adapter->mlmeextpriv); +struct mlme_priv *pmlmepriv = &adapter->mlmepriv; +struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; start = jiffies; pmlmeext->scan_abort = true;
@@ -1038,8 +1038,8 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str/* ptarget_wlan: found from scanned_queue */ static void rtw_joinbss_update_network (struct adapter *padapter,struct wlan_network *ptarget_wlan,struct wlan_network *pnetwork) { -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -struct wlan_network *cur_network = &(pmlmepriv->cur_network); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +struct wlan_network *cur_network = &pmlmepriv->cur_network;DBG_88E ("%s\n" , __func__);
@@ -1092,9 +1092,9 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)u8 timer_cancelled;struct sta_info *ptarget_sta =NULL , *pcur_sta =NULL ;struct sta_priv *pstapriv = &adapter->stapriv; -struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); +struct mlme_priv *pmlmepriv = &adapter->mlmepriv;struct wlan_network *pnetwork = (struct wlan_network *)pbuf; -struct wlan_network *cur_network = &(pmlmepriv->cur_network); +struct wlan_network *cur_network = &pmlmepriv->cur_network;struct wlan_network *pcur_wlan =NULL , *ptarget_wlan =NULL ;unsigned int the_same_macaddr = false;
@@ -1203,11 +1203,11 @@ static u8 search_max_mac_id(struct adapter *padapter)u8 mac_id;#if defined (CONFIG_88EU_AP_MODE )u8 aid; -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct sta_priv *pstapriv = &padapter->stapriv;#endif -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;#if defined (CONFIG_88EU_AP_MODE )if (check_fwstate (pmlmepriv,WIFI_AP_STATE )) {
@@ -1248,9 +1248,9 @@ void rtw_sta_media_status_rpt(struct adapter *adapter, struct sta_info *psta,void rtw_stassoc_event_callback (struct adapter *adapter,u8 *pbuf) {struct sta_info *psta; -struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); +struct mlme_priv *pmlmepriv = &adapter->mlmepriv;struct stassoc_event *pstassoc = (struct stassoc_event *)pbuf; -struct wlan_network *cur_network = &(pmlmepriv->cur_network); +struct wlan_network *cur_network = &pmlmepriv->cur_network;struct wlan_network *ptarget_wlan =NULL ;if (rtw_access_ctrl (adapter, pstassoc->macaddr) == false)
@@ -1307,10 +1307,10 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)struct wlan_network *pwlan =NULL ;struct wlan_bssid_ex *pdev_network =NULL ;u8 *pibss =NULL ; -struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); +struct mlme_priv *pmlmepriv = &adapter->mlmepriv;struct stadel_event *pstadel = (struct stadel_event *)pbuf;struct sta_priv *pstapriv = &adapter->stapriv; -struct wlan_network *tgt_network = &(pmlmepriv->cur_network); +struct wlan_network *tgt_network = &pmlmepriv->cur_network; psta =rtw_get_stainfo (&adapter->stapriv, pstadel->macaddr);if (psta)
@@ -1362,7 +1362,7 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf) }if (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) ||check_fwstate (pmlmepriv,WIFI_ADHOC_STATE )) { -spin_lock_bh (&(pstapriv->sta_hash_lock)); +spin_lock_bh (&pstapriv->sta_hash_lock);rtw_free_stainfo (adapter, psta);spin_unlock_bh (&pstapriv->sta_hash_lock);
@@ -1376,7 +1376,7 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf) }spin_unlock_bh (&pmlmepriv->scanned_queue.lock);/* re-create ibss */ - pdev_network = &(adapter->registrypriv.dev_network); + pdev_network = &adapter->registrypriv.dev_network; pibss = adapter->registrypriv.dev_network.MacAddress;memcpy (pdev_network, &tgt_network->network,get_wlan_bssid_ex_sz (&tgt_network->network));
@@ -1586,7 +1586,7 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv)int ret;struct list_head *phead;struct adapter *adapter; -struct __queue *queue = &(pmlmepriv->scanned_queue); +struct __queue *queue = &pmlmepriv->scanned_queue;struct wlan_network *pnetwork =NULL ;struct wlan_network *candidate =NULL ;u8 supp_ant_div = false;
@@ -1645,7 +1645,7 @@ int rtw_set_auth(struct adapter *adapter, struct security_priv *psecuritypriv) {struct cmd_obj *pcmd;struct setauth_parm *psetauthparm; -struct cmd_priv *pcmdpriv = &(adapter->cmdpriv); +struct cmd_priv *pcmdpriv = &adapter->cmdpriv;int res = _SUCCESS; pcmd =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );
@@ -1679,8 +1679,8 @@ int rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypriv, inu8 keylen;struct cmd_obj *pcmd;struct setkey_parm *psetkeyparm; -struct cmd_priv *pcmdpriv = &(adapter->cmdpriv); -struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); +struct cmd_priv *pcmdpriv = &adapter->cmdpriv; +struct mlme_priv *pmlmepriv = &adapter->mlmepriv;int res = _SUCCESS; pcmd =kzalloc (sizeof (struct cmd_obj ),GFP_KERNEL );
@@ -1710,11 +1710,11 @@ int rtw_set_key(struct adapter *adapter, struct security_priv *psecuritypriv, inswitch (psetkeyparm->algorithm) {case _WEP40_: keylen =5 ; -memcpy (&(psetkeyparm->key[0 ]), &(psecuritypriv->dot11DefKey[keyid].skey[0 ]), keylen); +memcpy (&psetkeyparm->key[0 ], &psecuritypriv->dot11DefKey[keyid].skey[0 ], keylen);break ;case _WEP104_: keylen =13 ; -memcpy (&(psetkeyparm->key[0 ]), &(psecuritypriv->dot11DefKey[keyid].skey[0 ]), keylen); +memcpy (&psetkeyparm->key[0 ], &psecuritypriv->dot11DefKey[keyid].skey[0 ], keylen);break ;case _TKIP_: keylen =16 ;
@@ -2059,7 +2059,7 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len)struct ht_priv *phtpriv = &pmlmepriv->htpriv;struct registry_priv *pregistrypriv = &padapter->registrypriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;if (!phtpriv->ht_option)return ;
Signature · 1 line
2.32.0
PATCH 10/17 staging: r8188eu: remove unnecessary parentheses in core/rtw_xmit.c
In reply to Michael StraubeRemove unnecessary parentheses in core/rtw_xmit.c reported by checkpatch.
--- drivers/staging/r8188eu/core/rtw_xmit.c | 54 ++++++++++++------------- 1 file changed, 27 insertions(+), 27 deletions(-)
drivers/staging/r8188eu/core/rtw_xmit.c +27 -27
@@ -86,7 +86,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxframe = (struct xmit_frame *)pxmitpriv->pxmit_frame_buf;for (i =0 ; i <NR_XMITFRAME ; i++) { -INIT_LIST_HEAD (&(pxframe->list)); +INIT_LIST_HEAD (&pxframe->list); pxframe->padapter = padapter; pxframe->frame_tag =NULL_FRAMETAG ;
@@ -96,7 +96,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxframe->buf_addr =NULL ; pxframe->pxmitbuf =NULL ; -list_add_tail (&(pxframe->list), &(pxmitpriv->free_xmit_queue.queue)); +list_add_tail (&pxframe->list, &pxmitpriv->free_xmit_queue.queue); pxframe++; }
@@ -141,7 +141,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxmitbuf->flags =XMIT_VO_QUEUE ; -list_add_tail (&pxmitbuf->list, &(pxmitpriv->free_xmitbuf_queue.queue)); +list_add_tail (&pxmitbuf->list, &pxmitpriv->free_xmitbuf_queue.queue); pxmitbuf++; }
@@ -174,7 +174,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) goto exit; } -list_add_tail (&pxmitbuf->list, &(pxmitpriv->free_xmit_extbuf_queue.queue)); +list_add_tail (&pxmitbuf->list, &pxmitpriv->free_xmit_extbuf_queue.queue); pxmitbuf++; }
@@ -188,7 +188,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) pxmitpriv->txirp_cnt =1 ; -sema_init (&(pxmitpriv->tx_retevt),0 ); +sema_init (&pxmitpriv->tx_retevt,0 );/* per AC pending irp */ pxmitpriv->beq_cnt =0 ;
@@ -260,8 +260,8 @@ static void update_attrib_vcs_info(struct adapter *padapter, struct xmit_frame *u32 sz;struct pkt_attrib *pattrib = &pxmitframe->attrib;struct sta_info *psta = pattrib->psta; -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;if (pattrib->nr_frags !=1 ) sz = padapter->xmitpriv.frag_len;
@@ -672,10 +672,10 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfr payload = payload+length+pattrib->icv_len; } } -rtw_secgetmic (&micdata, &(mic[0 ])); +rtw_secgetmic (&micdata, &mic[0 ]);/* add mic code and add the mic code length in last_txcmdsz */ -memcpy (payload, &(mic[0 ]),8 ); +memcpy (payload, &mic[0 ],8 ); pattrib->last_txcmdsz +=8 ; payload = payload-pattrib->last_txcmdsz+8 ;
@@ -852,20 +852,20 @@ s32 rtw_txframes_sta_ac_pending(struct adapter *padapter, struct pkt_attrib *patswitch (priority) {case 1 :case 2 : - ptxservq = &(psta->sta_xmitpriv.bk_q); + ptxservq = &psta->sta_xmitpriv.bk_q;break ;case 4 :case 5 : - ptxservq = &(psta->sta_xmitpriv.vi_q); + ptxservq = &psta->sta_xmitpriv.vi_q;break ;case 6 :case 7 : - ptxservq = &(psta->sta_xmitpriv.vo_q); + ptxservq = &psta->sta_xmitpriv.vo_q;break ;case 0 :case 3 :default : - ptxservq = &(psta->sta_xmitpriv.be_q); + ptxservq = &psta->sta_xmitpriv.be_q;break ; }
@@ -1156,7 +1156,7 @@ struct xmit_buf *rtw_alloc_xmitbuf_ext(struct xmit_priv *pxmitpriv) pxmitbuf = container_of(plist, struct xmit_buf, list); -list_del_init (&(pxmitbuf->list)); +list_del_init (&pxmitbuf->list); }if (pxmitbuf) {
@@ -1188,7 +1188,7 @@ s32 rtw_free_xmitbuf_ext(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)list_del_init (&pxmitbuf->list); -list_add_tail (&(pxmitbuf->list),get_list_head (pfree_queue)); +list_add_tail (&pxmitbuf->list,get_list_head (pfree_queue)); pxmitpriv->free_xmit_extbuf_cnt++;spin_unlock_irqrestore (&pfree_queue->lock, flags);
@@ -1216,7 +1216,7 @@ struct xmit_buf *rtw_alloc_xmitbuf(struct xmit_priv *pxmitpriv) pxmitbuf = container_of(plist, struct xmit_buf, list); -list_del_init (&(pxmitbuf->list)); +list_del_init (&pxmitbuf->list); }if (pxmitbuf) {
@@ -1252,7 +1252,7 @@ s32 rtw_free_xmitbuf(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)list_del_init (&pxmitbuf->list); -list_add_tail (&(pxmitbuf->list),get_list_head (pfree_xmitbuf_queue)); +list_add_tail (&pxmitbuf->list,get_list_head (pfree_xmitbuf_queue)); pxmitpriv->free_xmitbuf_cnt++;spin_unlock_irqrestore (&pfree_xmitbuf_queue->lock, flags);
@@ -1296,7 +1296,7 @@ struct xmit_frame *rtw_alloc_xmitframe(struct xmit_priv *pxmitpriv)/* _queue *pf pxframe = container_of(plist, struct xmit_frame, list); -list_del_init (&(pxframe->list)); +list_del_init (&pxframe->list); }if (pxframe) {/* default value setting */
@@ -1465,23 +1465,23 @@ struct tx_servq *rtw_get_sta_pending(struct adapter *padapter, struct sta_info *switch (up) {case 1 :case 2 : - ptxservq = &(psta->sta_xmitpriv.bk_q); + ptxservq = &psta->sta_xmitpriv.bk_q; *(ac) =3 ;break ;case 4 :case 5 : - ptxservq = &(psta->sta_xmitpriv.vi_q); + ptxservq = &psta->sta_xmitpriv.vi_q; *(ac) =1 ;break ;case 6 :case 7 : - ptxservq = &(psta->sta_xmitpriv.vo_q); + ptxservq = &psta->sta_xmitpriv.vo_q; *(ac) =0 ;break ;case 0 :case 3 :default : - ptxservq = &(psta->sta_xmitpriv.be_q); + ptxservq = &psta->sta_xmitpriv.be_q; *(ac) =2 ;break ; }
@@ -1951,21 +1951,21 @@ void stop_sta_xmit(struct adapter *padapter, struct sta_info *psta) pstapriv->sta_dz_bitmap |=BIT (psta->aid);dequeue_xmitframes_to_sleeping_queue (padapter, psta, &pstaxmitpriv->vo_q.sta_pending); -list_del_init (&(pstaxmitpriv->vo_q.tx_pending)); +list_del_init (&pstaxmitpriv->vo_q.tx_pending);dequeue_xmitframes_to_sleeping_queue (padapter, psta, &pstaxmitpriv->vi_q.sta_pending); -list_del_init (&(pstaxmitpriv->vi_q.tx_pending)); +list_del_init (&pstaxmitpriv->vi_q.tx_pending);dequeue_xmitframes_to_sleeping_queue (padapter, psta, &pstaxmitpriv->be_q.sta_pending); -list_del_init (&(pstaxmitpriv->be_q.tx_pending)); +list_del_init (&pstaxmitpriv->be_q.tx_pending);dequeue_xmitframes_to_sleeping_queue (padapter, psta, &pstaxmitpriv->bk_q.sta_pending); -list_del_init (&(pstaxmitpriv->bk_q.tx_pending)); +list_del_init (&pstaxmitpriv->bk_q.tx_pending);/* for BC/MC Frames */ pstaxmitpriv = &psta_bmc->sta_xmitpriv;dequeue_xmitframes_to_sleeping_queue (padapter, psta_bmc, &pstaxmitpriv->be_q.sta_pending); -list_del_init (&(pstaxmitpriv->be_q.tx_pending)); +list_del_init (&pstaxmitpriv->be_q.tx_pending);spin_unlock_bh (&pxmitpriv->lock); }
Signature · 1 line
2.32.0
PATCH 11/17 staging: r8188eu: remove unnecessary parentheses in core/rtw_sta_mgt.c
In reply to Michael StraubeRemove unnecessary parentheses in core/rtw_sta_mgt.c reported by checkpatch.
--- drivers/staging/r8188eu/core/rtw_sta_mgt.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/staging/r8188eu/core/rtw_sta_mgt.c +11 -11
@@ -81,7 +81,7 @@ u32 _rtw_init_sta_priv(struct sta_priv *pstapriv)for (i =0 ; i <NUM_STA ; i++) {_rtw_init_stainfo (psta); -INIT_LIST_HEAD (&(pstapriv->sta_hash[i])); +INIT_LIST_HEAD (&pstapriv->sta_hash[i]);list_add_tail (&psta->list,get_list_head (&pstapriv->free_sta_queue));
@@ -145,7 +145,7 @@ u32 _rtw_free_sta_priv(struct sta_priv *pstapriv)/* delete all reordering_ctrl_timer */ spin_lock_bh (&pstapriv->sta_hash_lock);for (index =0 ; index <NUM_STA ; index++) { - phead = &(pstapriv->sta_hash[index]); + phead = &pstapriv->sta_hash[index]; plist = phead->next;while (phead != plist) {
@@ -190,7 +190,7 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr) psta =NULL ; }else { psta = container_of((&pfree_sta_queue->queue)->next, struct sta_info, list); -list_del_init (&(psta->list)); +list_del_init (&psta->list);spin_unlock_bh (&pfree_sta_queue->lock);_rtw_init_stainfo (psta);memcpy (psta->hwaddr, hwaddr,ETH_ALEN );
@@ -199,7 +199,7 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr) psta =NULL ; goto exit; } - phash_list = &(pstapriv->sta_hash[index]); + phash_list = &pstapriv->sta_hash[index];spin_lock_bh (&pstapriv->sta_hash_lock);
@@ -273,19 +273,19 @@ u32 rtw_free_stainfo(struct adapter *padapter, struct sta_info *psta)rtw_free_xmitframe_queue (pxmitpriv, &pstaxmitpriv->vo_q.sta_pending); -list_del_init (&(pstaxmitpriv->vo_q.tx_pending)); +list_del_init (&pstaxmitpriv->vo_q.tx_pending);rtw_free_xmitframe_queue (pxmitpriv, &pstaxmitpriv->vi_q.sta_pending); -list_del_init (&(pstaxmitpriv->vi_q.tx_pending)); +list_del_init (&pstaxmitpriv->vi_q.tx_pending);rtw_free_xmitframe_queue (pxmitpriv, &pstaxmitpriv->bk_q.sta_pending); -list_del_init (&(pstaxmitpriv->bk_q.tx_pending)); +list_del_init (&pstaxmitpriv->bk_q.tx_pending);rtw_free_xmitframe_queue (pxmitpriv, &pstaxmitpriv->be_q.sta_pending); -list_del_init (&(pstaxmitpriv->be_q.tx_pending)); +list_del_init (&pstaxmitpriv->be_q.tx_pending);spin_unlock_bh (&pxmitpriv->lock);
@@ -321,7 +321,7 @@ u32 rtw_free_stainfo(struct adapter *padapter, struct sta_info *psta) plist = plist->next; -list_del_init (&(prframe->list)); +list_del_init (&prframe->list);rtw_free_recvframe (prframe, pfree_recv_queue); }
@@ -389,7 +389,7 @@ void rtw_free_all_stainfo(struct adapter *padapter)spin_lock_bh (&pstapriv->sta_hash_lock);for (index =0 ; index <NUM_STA ; index++) { - phead = &(pstapriv->sta_hash[index]); + phead = &pstapriv->sta_hash[index]; plist = phead->next;while (phead != plist) {
@@ -425,7 +425,7 @@ struct sta_info *rtw_get_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)spin_lock_bh (&pstapriv->sta_hash_lock); - phead = &(pstapriv->sta_hash[index]); + phead = &pstapriv->sta_hash[index]; plist = phead->next;while (phead != plist) {
Signature · 1 line
2.32.0
PATCH 12/17 staging: r8188eu: remove unnecessary parentheses in core/rtw_recv.c
In reply to Michael StraubeRemove unnecessary parentheses in core/rtw_recv.c reported by checkpatch.
--- drivers/staging/r8188eu/core/rtw_recv.c | 26 ++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
drivers/staging/r8188eu/core/rtw_recv.c +13 -13
@@ -70,9 +70,9 @@ int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *padapter) precvframe = (struct recv_frame *)precvpriv->precv_frame_buf;for (i =0 ; i <NR_RECVFRAME ; i++) { -INIT_LIST_HEAD (&(precvframe->list)); +INIT_LIST_HEAD (&precvframe->list); -list_add_tail (&(precvframe->list), &(precvpriv->free_recv_queue.queue)); +list_add_tail (&precvframe->list, &precvpriv->free_recv_queue.queue); res =rtw_os_recv_resource_alloc (padapter, precvframe);
@@ -174,11 +174,11 @@ int rtw_free_recvframe(struct recv_frame *precvframe, struct __queue *pfree_recvspin_lock_bh (&pfree_recv_queue->lock); -list_del_init (&(precvframe->list)); +list_del_init (&precvframe->list); precvframe->len =0 ; -list_add_tail (&(precvframe->list),get_list_head (pfree_recv_queue)); +list_add_tail (&precvframe->list,get_list_head (pfree_recv_queue));if (padapter) {if (pfree_recv_queue == &precvpriv->free_recv_queue)
@@ -195,8 +195,8 @@ int _rtw_enqueue_recvframe(struct recv_frame *precvframe, struct __queue *queue)struct adapter *padapter = precvframe->adapter;struct recv_priv *precvpriv = &padapter->recvpriv; -list_del_init (&(precvframe->list)); -list_add_tail (&(precvframe->list),get_list_head (queue)); +list_del_init (&precvframe->list); +list_add_tail (&precvframe->list,get_list_head (queue));if (padapter) {if (queue == &precvpriv->free_recv_queue)
@@ -323,7 +323,7 @@ static int recvframe_chkmic(struct adapter *adapter, struct recv_frame *precvfrstruct security_priv *psecuritypriv = &adapter->securitypriv;struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info; stainfo =rtw_get_stainfo (&adapter->stapriv, &prxattrib->ta[0 ]);
@@ -1338,7 +1338,7 @@ static struct recv_frame *recvframe_defrag(struct adapter *adapter, struct __que plist = phead->next; pfhdr = container_of(plist, struct recv_frame, list); prframe = (struct recv_frame *)pfhdr; -list_del_init (&(prframe->list)); +list_del_init (&prframe->list);if (curfragnum != pfhdr->attrib.frag_num) {/* the first fragment number must be 0 */
@@ -1355,7 +1355,7 @@ static struct recv_frame *recvframe_defrag(struct adapter *adapter, struct __que plist = phead->next; pfhdr = container_of(plist, struct recv_frame, list); prframe = (struct recv_frame *)pfhdr; -list_del_init (&(prframe->list)); +list_del_init (&prframe->list); plist = plist->next;
@@ -1506,7 +1506,7 @@ static int amsdu_to_msdu(struct adapter *padapter, struct recv_frame *prframe)unsigned char *data_ptr;struct sk_buff *sub_skb, *subframes[MAX_SUBFRAME_COUNT ];struct recv_priv *precvpriv = &padapter->recvpriv; -struct __queue *pfree_recv_queue = &(precvpriv->free_recv_queue); +struct __queue *pfree_recv_queue = &precvpriv->free_recv_queue;int ret = _SUCCESS; nr_subframes =0 ;
@@ -1668,9 +1668,9 @@ int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl, struct rebreak ; } -list_del_init (&(prframe->list)); +list_del_init (&prframe->list); -list_add_tail (&(prframe->list), plist); +list_add_tail (&prframe->list, plist);return true; }
@@ -1704,7 +1704,7 @@ static int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reorif (!SN_LESS (preorder_ctrl->indicate_seq, pattrib->seq_num)) { plist = plist->next; -list_del_init (&(prframe->list)); +list_del_init (&prframe->list);if (SN_EQUAL (preorder_ctrl->indicate_seq, pattrib->seq_num)) preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq +1 ) &0xFFF ;
Signature · 1 line
2.32.0
PATCH 13/17 staging: r8188eu: remove unnecessary parentheses in core/rtw_pwrctrl.c
In reply to Michael StraubeRemove unnecessary parentheses in core/rtw_pwrctrl.c reported by checkpatch.
--- drivers/staging/r8188eu/core/rtw_pwrctrl.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
drivers/staging/r8188eu/core/rtw_pwrctrl.c +10 -10
@@ -51,8 +51,8 @@ void ips_enter(struct adapter *padapter)int ips_leave (struct adapter *padapter) {struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -struct security_priv *psecuritypriv = &(padapter->securitypriv); -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct security_priv *psecuritypriv = &padapter->securitypriv; +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;int result = _SUCCESS;int keyid;
@@ -98,9 +98,9 @@ int ips_leave(struct adapter *padapter)static bool rtw_pwr_unassociated_idle (struct adapter *adapter) {struct adapter *buddy = adapter->pbuddy_adapter; -struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); +struct mlme_priv *pmlmepriv = &adapter->mlmepriv;#ifdef CONFIG_88EU_P2P -struct wifidirect_info *pwdinfo = &(adapter->wdinfo); +struct wifidirect_info *pwdinfo = &adapter->wdinfo;#endif bool ret = false;
@@ -122,9 +122,9 @@ static bool rtw_pwr_unassociated_idle(struct adapter *adapter)/* consider buddy, if exist */ if (buddy) { -struct mlme_priv *b_pmlmepriv = &(buddy->mlmepriv); +struct mlme_priv *b_pmlmepriv = &buddy->mlmepriv;#ifdef CONFIG_88EU_P2P -struct wifidirect_info *b_pwdinfo = &(buddy->wdinfo); +struct wifidirect_info *b_pwdinfo = &buddy->wdinfo;#endif if (check_fwstate(b_pmlmepriv, WIFI_ASOC_STATE|WIFI_SITE_MONITOR) ||
@@ -147,7 +147,7 @@ static bool rtw_pwr_unassociated_idle(struct adapter *adapter)void rtw_ps_processor (struct adapter *padapter) {struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;enum rt_rf_power_state rfpwrstate; pwrpriv->ps_processing = true;
@@ -248,7 +248,7 @@ static u8 PS_RDY_CHECK(struct adapter *padapter) {u32 curr_time, delta_time;struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv; curr_time = jiffies; delta_time = curr_time - pwrpriv->DelayLPSLastTimeStamp;
@@ -275,7 +275,7 @@ void rtw_set_ps_mode(struct adapter *padapter, u8 ps_mode, u8 smart_ps, u8 bcn_a {struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;#ifdef CONFIG_88EU_P2P -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct wifidirect_info *pwdinfo = &padapter->wdinfo;#endif /* CONFIG_88EU_P2P */ if (ps_mode > PM_Card_Disable)
@@ -412,7 +412,7 @@ void LPS_Leave(struct adapter *padapter)/* */ void LeaveAllPowerSaveMode (struct adapter *Adapter) { -struct mlme_priv *pmlmepriv = &(Adapter->mlmepriv); +struct mlme_priv *pmlmepriv = &Adapter->mlmepriv;u8 enqueue =0 ;if (check_fwstate (pmlmepriv, _FW_LINKED)) {/* connect */
Signature · 1 line
2.32.0
PATCH 14/17 staging: r8188eu: remove unnecessary parentheses in core/rtw_io.c
In reply to Michael StraubeRemove unnecessary parentheses in core/rtw_io.c reported by checkpatch.
--- drivers/staging/r8188eu/core/rtw_io.c | 32 +++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-)
drivers/staging/r8188eu/core/rtw_io.c +16 -16
@@ -38,7 +38,7 @@ u8 _rtw_read8(struct adapter *adapter, u32 addr) {u8 r_val;struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &(pio_priv->intf); +struct intf_hdl *pintfhdl = &pio_priv->intf;u8 (*_read8)(struct intf_hdl *pintfhdl,u32 addr);
@@ -52,7 +52,7 @@ u16 _rtw_read16(struct adapter *adapter, u32 addr) {u16 r_val;struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &(pio_priv->intf); +struct intf_hdl *pintfhdl = &pio_priv->intf;u16 (*_read16)(struct intf_hdl *pintfhdl,u32 addr); _read16 = pintfhdl->io_ops._read16;
@@ -66,7 +66,7 @@ u32 _rtw_read32(struct adapter *adapter, u32 addr) {u32 r_val;struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &(pio_priv->intf); +struct intf_hdl *pintfhdl = &pio_priv->intf;u32 (*_read32)(struct intf_hdl *pintfhdl,u32 addr); _read32 = pintfhdl->io_ops._read32;
@@ -79,7 +79,7 @@ u32 _rtw_read32(struct adapter *adapter, u32 addr)int _rtw_write8 (struct adapter *adapter,u32 addr,u8 val) {struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &(pio_priv->intf); +struct intf_hdl *pintfhdl = &pio_priv->intf;int (*_write8)(struct intf_hdl *pintfhdl,u32 addr,u8 val);int ret;
@@ -94,7 +94,7 @@ int _rtw_write8(struct adapter *adapter, u32 addr, u8 val)int _rtw_write16 (struct adapter *adapter,u32 addr,u16 val) {struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &(pio_priv->intf); +struct intf_hdl *pintfhdl = &pio_priv->intf;int (*_write16)(struct intf_hdl *pintfhdl,u32 addr,u16 val);int ret;
@@ -108,7 +108,7 @@ int _rtw_write16(struct adapter *adapter, u32 addr, u16 val)int _rtw_write32 (struct adapter *adapter,u32 addr,u32 val) {struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &(pio_priv->intf); +struct intf_hdl *pintfhdl = &pio_priv->intf;int (*_write32)(struct intf_hdl *pintfhdl,u32 addr,u32 val);int ret;
@@ -123,7 +123,7 @@ int _rtw_write32(struct adapter *adapter, u32 addr, u32 val)int _rtw_writeN (struct adapter *adapter,u32 addr,u32 length,u8 *pdata) {struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = (struct intf_hdl *)(&(pio_priv->intf)); +struct intf_hdl *pintfhdl = (struct intf_hdl *)(&pio_priv->intf);int (*_writeN)(struct intf_hdl *pintfhdl,u32 addr,u32 length,u8 *pdata);int ret;
@@ -137,7 +137,7 @@ int _rtw_writeN(struct adapter *adapter, u32 addr, u32 length, u8 *pdata)int _rtw_write8_async (struct adapter *adapter,u32 addr,u8 val) {struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &(pio_priv->intf); +struct intf_hdl *pintfhdl = &pio_priv->intf;int (*_write8_async)(struct intf_hdl *pintfhdl,u32 addr,u8 val);int ret;
@@ -152,7 +152,7 @@ int _rtw_write8_async(struct adapter *adapter, u32 addr, u8 val)int _rtw_write16_async (struct adapter *adapter,u32 addr,u16 val) {struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &(pio_priv->intf); +struct intf_hdl *pintfhdl = &pio_priv->intf;int (*_write16_async)(struct intf_hdl *pintfhdl,u32 addr,u16 val);int ret;
@@ -165,7 +165,7 @@ int _rtw_write16_async(struct adapter *adapter, u32 addr, u16 val)int _rtw_write32_async (struct adapter *adapter,u32 addr,u32 val) {struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &(pio_priv->intf); +struct intf_hdl *pintfhdl = &pio_priv->intf;int (*_write32_async)(struct intf_hdl *pintfhdl,u32 addr,u32 val);int ret;
@@ -179,7 +179,7 @@ void _rtw_read_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem) {void (*_read_mem)(struct intf_hdl *pintfhdl,u32 addr,u32 cnt,u8 *pmem);struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &(pio_priv->intf); +struct intf_hdl *pintfhdl = &pio_priv->intf;if (adapter->bDriverStopped || adapter->bSurpriseRemoved)
@@ -193,7 +193,7 @@ void _rtw_write_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem) {void (*_write_mem)(struct intf_hdl *pintfhdl,u32 addr,u32 cnt,u8 *pmem);struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &(pio_priv->intf); +struct intf_hdl *pintfhdl = &pio_priv->intf;
@@ -208,7 +208,7 @@ void _rtw_read_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem) {u32 (*_read_port)(struct intf_hdl *pintfhdl,u32 addr,u32 cnt,u8 *pmem);struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &(pio_priv->intf); +struct intf_hdl *pintfhdl = &pio_priv->intf;
@@ -226,7 +226,7 @@ void _rtw_read_port_cancel(struct adapter *adapter) {void (*_read_port_cancel)(struct intf_hdl *pintfhdl);struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &(pio_priv->intf); +struct intf_hdl *pintfhdl = &pio_priv->intf; _read_port_cancel = pintfhdl->io_ops._read_port_cancel;
@@ -238,7 +238,7 @@ u32 _rtw_write_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem) {u32 (*_write_port)(struct intf_hdl *pintfhdl,u32 addr,u32 cnt,u8 *pmem);struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &(pio_priv->intf); +struct intf_hdl *pintfhdl = &pio_priv->intf;u32 ret = _SUCCESS;
@@ -273,7 +273,7 @@ void _rtw_write_port_cancel(struct adapter *adapter) {void (*_write_port_cancel)(struct intf_hdl *pintfhdl);struct io_priv *pio_priv = &adapter->iopriv; -struct intf_hdl *pintfhdl = &(pio_priv->intf); +struct intf_hdl *pintfhdl = &pio_priv->intf; _write_port_cancel = pintfhdl->io_ops._write_port_cancel;
Signature · 1 line
2.32.0
PATCH 15/17 staging: r8188eu: remove unnecessary parentheses in core/rtw_ioctl_set.c
In reply to Michael StraubeRemove unnecessary parentheses in core/rtw_ioctl_set.c reported by checkpatch.
--- drivers/staging/r8188eu/core/rtw_ioctl_set.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/staging/r8188eu/core/rtw_ioctl_set.c +9 -9
@@ -40,8 +40,8 @@ u8 rtw_do_join(struct adapter *padapter) {struct list_head *plist, *phead;u8 *pibss =NULL ; -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); -struct __queue *queue = &(pmlmepriv->scanned_queue); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv; +struct __queue *queue = &pmlmepriv->scanned_queue;u8 ret = _SUCCESS;spin_lock_bh (&pmlmepriv->scanned_queue.lock);
@@ -88,7 +88,7 @@ u8 rtw_do_join(struct adapter *padapter)/* submit createbss_cmd to change to a ADHOC_MASTER */ /* pmlmepriv->lock has been acquired by caller... */ -struct wlan_bssid_ex *pdev_network = &(padapter->registrypriv.dev_network); +struct wlan_bssid_ex *pdev_network = &padapter->registrypriv.dev_network; pmlmepriv->fw_state =WIFI_ADHOC_MASTER_STATE ;
@@ -301,7 +301,7 @@ u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter, {struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct wlan_network *cur_network = &pmlmepriv->cur_network; -enum ndis_802_11_network_infra *pold_state = &(cur_network->network.InfrastructureMode); +enum ndis_802_11_network_infra *pold_state = &cur_network->network.InfrastructureMode;if (*pold_state != networktype) {spin_lock_bh (&pmlmepriv->lock);
@@ -435,7 +435,7 @@ u8 rtw_set_802_11_authentication_mode(struct adapter *padapter, enum ndis_802_11u8 rtw_set_802_11_add_wep (struct adapter *padapter,struct ndis_802_11_wep *wep) {int keyid, res; -struct security_priv *psecuritypriv = &(padapter->securitypriv); +struct security_priv *psecuritypriv = &padapter->securitypriv;u8 ret = _SUCCESS; keyid = wep->KeyIndex &0x3fffffff ;
@@ -457,7 +457,7 @@ u8 rtw_set_802_11_add_wep(struct adapter *padapter, struct ndis_802_11_wep *wep)break ; } -memcpy (&(psecuritypriv->dot11DefKey[keyid].skey[0 ]), &(wep->KeyMaterial), wep->KeyLength); +memcpy (&psecuritypriv->dot11DefKey[keyid].skey[0 ], &wep->KeyMaterial, wep->KeyLength); psecuritypriv->dot11DefKeylen[keyid] = wep->KeyLength;
@@ -481,7 +481,7 @@ u8 rtw_set_802_11_remove_wep(struct adapter *padapter, u32 keyindex) goto exit; }else {int res; -struct security_priv *psecuritypriv = &(padapter->securitypriv); +struct security_priv *psecuritypriv = &padapter->securitypriv;if (keyindex <4 ) {memset (&psecuritypriv->dot11DefKey[keyindex],0 ,16 ); res =rtw_set_key (padapter, psecuritypriv, keyindex,0 );
@@ -628,7 +628,7 @@ u8 rtw_set_802_11_add_key(struct adapter *padapter, struct ndis_802_11_key *key) wep->KeyLength = key->KeyLength;memcpy (wep->KeyMaterial, key->KeyMaterial, key->KeyLength); -memcpy (&(padapter->securitypriv.dot11DefKey[keyindex].skey[0 ]), key->KeyMaterial, key->KeyLength); +memcpy (&padapter->securitypriv.dot11DefKey[keyindex].skey[0 ], key->KeyMaterial, key->KeyLength); padapter->securitypriv.dot11DefKeylen[keyindex] = key->KeyLength; padapter->securitypriv.dot11PrivacyKeyIndex = keyindex;
@@ -776,7 +776,7 @@ u16 rtw_get_cur_max_rate(struct adapter *adapter)u8 *p;u16 rate =0 , max_rate =0 ;struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;struct registry_priv *pregistrypriv = &adapter->registrypriv;struct mlme_priv *pmlmepriv = &adapter->mlmepriv;struct wlan_bssid_ex *pcur_bss = &pmlmepriv->cur_network.network;
Signature · 1 line
2.32.0
PATCH 16/17 staging: r8188eu: remove unnecessary parentheses in core/rtw_cmd.c
In reply to Michael StraubeRemove unnecessary parentheses in core/rtw_cmd.c reported by checkpatch.
--- drivers/staging/r8188eu/core/rtw_cmd.c | 36 +++++++++++++------------- 1 file changed, 18 insertions(+), 18 deletions(-)
drivers/staging/r8188eu/core/rtw_cmd.c +18 -18
@@ -20,11 +20,11 @@ int _rtw_init_cmd_priv (struct cmd_priv *pcmdpriv) {int res = _SUCCESS; -sema_init (&(pcmdpriv->cmd_queue_sema),0 ); +sema_init (&pcmdpriv->cmd_queue_sema,0 );/* sema_init(&(pcmdpriv->cmd_done_sema), 0); */ -sema_init (&(pcmdpriv->terminate_cmdthread_sema),0 ); +sema_init (&pcmdpriv->terminate_cmdthread_sema,0 ); -_rtw_init_queue (&(pcmdpriv->cmd_queue)); +_rtw_init_queue (&pcmdpriv->cmd_queue);/* allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf */
@@ -133,10 +133,10 @@ struct cmd_obj *_rtw_dequeue_cmd(struct __queue *queue)unsigned long flags;spin_lock_irqsave (&queue->lock, flags); -if (list_empty (&(queue->queue))) { +if (list_empty (&queue->queue)) { obj =NULL ; }else { - obj = container_of((&(queue->queue))->next, struct cmd_obj, list); + obj = container_of((&queue->queue)->next, struct cmd_obj, list);rtw_list_delete (&obj->list); }
@@ -262,7 +262,7 @@ int rtw_cmd_thread(void *context)u8 (*cmd_hdl)(struct adapter *padapter,u8 *pbuf);void (*pcmd_callback)(struct adapter *dev,struct cmd_obj *pcmd);struct adapter *padapter = (struct adapter *)context; -struct cmd_priv *pcmdpriv = &(padapter->cmdpriv); +struct cmd_priv *pcmdpriv = &padapter->cmdpriv;thread_enter ("RTW_CMD_THREAD" );
@@ -794,7 +794,7 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork)struct ht_priv *phtpriv = &pmlmepriv->htpriv;enum ndis_802_11_network_infra ndis_network_mode = pnetwork->network.InfrastructureMode;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;rtw_led_control (padapter,LED_CTL_START_TO_LINK );
@@ -1439,7 +1439,7 @@ static void traffic_status_watchdog(struct adapter *padapter)u8 bEnterPS;u8 bBusyTraffic = false, bTxBusyTraffic = false, bRxBusyTraffic = false;u8 bHigherBusyTraffic = false, bHigherBusyRxTraffic = false, bHigherBusyTxTraffic = false; -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;/* */ /* Determine if our traffic is busy now */
@@ -1498,7 +1498,7 @@ static void dynamic_chk_wk_hdl(struct adapter *padapter, u8 *pbuf, int sz)struct mlme_priv *pmlmepriv; padapter = (struct adapter *)pbuf; - pmlmepriv = &(padapter->mlmepriv); + pmlmepriv = &padapter->mlmepriv;#ifdef CONFIG_88EU_AP_MODE if (check_fwstate (pmlmepriv,WIFI_AP_STATE ) == true)
@@ -1516,7 +1516,7 @@ static void dynamic_chk_wk_hdl(struct adapter *padapter, u8 *pbuf, int sz)static void lps_ctrl_wk_hdl (struct adapter *padapter,u8 lps_ctrl_type) {struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv; -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;u8 mstatus; if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true) ||
@@ -1693,7 +1693,7 @@ u8 p2p_protocol_wk_cmd(struct adapter *padapter, int intCmdType) {struct cmd_obj *ph2c;struct drvextra_cmd_parm *pdrvextra_cmd_parm; -struct wifidirect_info *pwdinfo = &(padapter->wdinfo); +struct wifidirect_info *pwdinfo = &padapter->wdinfo;struct cmd_priv *pcmdpriv = &padapter->cmdpriv;u8 res = _SUCCESS;
@@ -2045,9 +2045,9 @@ void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd)struct wlan_network *pwlan =NULL ;struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct wlan_bssid_ex *pnetwork = (struct wlan_bssid_ex *)pcmd->parmbuf; -struct wlan_network *tgt_network = &(pmlmepriv->cur_network); +struct wlan_network *tgt_network = &pmlmepriv->cur_network; -if ((pcmd->res !=H2C_SUCCESS )) +if (pcmd->res !=H2C_SUCCESS )_set_timer (&pmlmepriv->assoc_timer,1 );_cancel_timer (&pmlmepriv->assoc_timer, &timer_cancelled);
@@ -2066,26 +2066,26 @@ void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd) }else { pwlan =_rtw_alloc_network (pmlmepriv); -spin_lock_bh (&(pmlmepriv->scanned_queue.lock)); +spin_lock_bh (&pmlmepriv->scanned_queue.lock);if (!pwlan) { pwlan =rtw_get_oldest_wlan_network (&pmlmepriv->scanned_queue);if (!pwlan) { -spin_unlock_bh (&(pmlmepriv->scanned_queue.lock)); +spin_unlock_bh (&pmlmepriv->scanned_queue.lock); goto createbss_cmd_fail; } pwlan->last_scanned = jiffies; }else { -list_add_tail (&(pwlan->list), &pmlmepriv->scanned_queue.queue); +list_add_tail (&pwlan->list, &pmlmepriv->scanned_queue.queue); } pnetwork->Length =get_wlan_bssid_ex_sz (pnetwork); -memcpy (&(pwlan->network), pnetwork, pnetwork->Length); +memcpy (&pwlan->network, pnetwork, pnetwork->Length);memcpy (&tgt_network->network, pnetwork, (get_wlan_bssid_ex_sz (pnetwork)));_clr_fwstate_ (pmlmepriv, _FW_UNDER_LINKING); -spin_unlock_bh (&(pmlmepriv->scanned_queue.lock)); +spin_unlock_bh (&pmlmepriv->scanned_queue.lock);/* we will set _FW_LINKED when there is one more sat to join us (rtw_stassoc_event_callback) */ }
Signature · 1 line
2.32.0
PATCH 17/17 staging: r8188eu: remove remaining unnecessary parentheses in core dir
In reply to Michael StraubeRemove remaining unnecessary parentheses in core dir reported by checkpatch.
--- drivers/staging/r8188eu/core/rtw_br_ext.c | 6 +++--- drivers/staging/r8188eu/core/rtw_debug.c | 14 +++++++------- drivers/staging/r8188eu/core/rtw_ieee80211.c | 4 ++-- drivers/staging/r8188eu/core/rtw_iol.c | 2 +- drivers/staging/r8188eu/core/rtw_mp.c | 10 +++++----- 5 files changed, 18 insertions(+), 18 deletions(-)
drivers/staging/r8188eu/core/rtw_br_ext.c +3 -3
@@ -319,7 +319,7 @@ static inline void __network_hash_link(struct adapter *priv,static inline void __network_hash_unlink (struct nat25_network_db_entry *ent) {/* Caller must spin_lock already! */ - *(ent->pprev_hash) = ent->next_hash; + *ent->pprev_hash = ent->next_hash;if (ent->next_hash) ent->next_hash->pprev_hash = ent->pprev_hash; ent->next_hash =NULL ;
@@ -853,7 +853,7 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method) }else {/* session phase */ DEBUG_INFO ("NAT25: Insert PPPoE, insert session packet to %s\n" , skb->dev->name); -__nat25_generate_pppoe_network_addr (networkAddr, skb->data, &(ph->sid)); +__nat25_generate_pppoe_network_addr (networkAddr, skb->data, &ph->sid);__nat25_db_network_insert (priv, skb->data+ETH_ALEN , networkAddr);
@@ -921,7 +921,7 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method) }else {if (ph->sid !=0 ) {DEBUG_INFO ("NAT25: Lookup PPPoE, lookup session packet from %s\n" , skb->dev->name); -__nat25_generate_pppoe_network_addr (networkAddr, skb->data+ETH_ALEN , &(ph->sid)); +__nat25_generate_pppoe_network_addr (networkAddr, skb->data+ETH_ALEN , &ph->sid);__nat25_db_network_lookup_and_replace (priv, skb, networkAddr);__nat25_db_print (priv); }else {
drivers/staging/r8188eu/core/rtw_debug.c +7 -7
@@ -133,7 +133,7 @@ int proc_get_fwstate(char *page, char **start, {struct net_device *dev = data;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;int len =0 ;
@@ -168,7 +168,7 @@ int proc_get_mlmext_state(char *page, char **start,struct net_device *dev = data;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev);struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); +struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;int len =0 ;
@@ -184,7 +184,7 @@ int proc_get_qos_option(char *page, char **start, {struct net_device *dev = data;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;int len =0 ;
@@ -200,7 +200,7 @@ int proc_get_ht_option(char *page, char **start, {struct net_device *dev = data;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;int len =0 ; len +=snprintf (page + len, count - len,"ht_option=%d\n" , pmlmepriv->htpriv.ht_option);
@@ -230,9 +230,9 @@ int proc_get_ap_info(char *page, char **start,struct sta_info *psta;struct net_device *dev = data;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (dev); -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; -struct wlan_network *cur_network = &(pmlmepriv->cur_network); +struct wlan_network *cur_network = &pmlmepriv->cur_network;struct sta_priv *pstapriv = &padapter->stapriv;int len =0 ;
@@ -830,7 +830,7 @@ int proc_get_all_sta_info(char *page, char **start,spin_lock_bh (&pstapriv->sta_hash_lock);for (i =0 ; i <NUM_STA ; i++) { - phead = &(pstapriv->sta_hash[i]); + phead = &pstapriv->sta_hash[i]; plist = phead->next;while (phead != plist) {
drivers/staging/r8188eu/core/rtw_ieee80211.c +2 -2
@@ -414,11 +414,11 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv) }/* DS parameter set */ - ie =rtw_set_ie (ie, _DSSET_IE_,1 , (u8 *)&(pdev_network->Configuration.DSConfig), &sz); + ie =rtw_set_ie (ie, _DSSET_IE_,1 , (u8 *)&pdev_network->Configuration.DSConfig, &sz);/* IBSS Parameter Set */ - ie =rtw_set_ie (ie, _IBSS_PARA_IE_,2 , (u8 *)&(pdev_network->Configuration.ATIMWindow), &sz); + ie =rtw_set_ie (ie, _IBSS_PARA_IE_,2 , (u8 *)&pdev_network->Configuration.ATIMWindow, &sz);if (rateLen >8 ) ie =rtw_set_ie (ie, _EXT_SUPPORTEDRATES_IE_, (rateLen -8 ), (pdev_network->SupportedRates +8 ), &sz);
drivers/staging/r8188eu/core/rtw_iol.c +1 -1
@@ -8,7 +8,7 @@ struct xmit_frame *rtw_IOL_accquire_xmit_frame(struct adapter *adapter)struct xmit_frame *xmit_frame;struct xmit_buf *xmitbuf;struct pkt_attrib *pattrib; -struct xmit_priv *pxmitpriv = &(adapter->xmitpriv); +struct xmit_priv *pxmitpriv = &adapter->xmitpriv; xmit_frame =rtw_alloc_xmitframe (pxmitpriv);if (!xmit_frame) {
drivers/staging/r8188eu/core/rtw_mp.c +5 -5
@@ -577,7 +577,7 @@ static int mp_xmit_packet_thread(void *context) pmp_priv = (struct mp_priv *)context; pmptx = &pmp_priv->tx; padapter = pmp_priv->papdater; - pxmitpriv = &(padapter->xmitpriv); + pxmitpriv = &padapter->xmitpriv;thread_enter ("RTW_MP_THREAD" );
@@ -596,7 +596,7 @@ static int mp_xmit_packet_thread(void *context) }memcpy ((u8 *)(pxmitframe->buf_addr+TXDESC_OFFSET ), pmptx->buf, pmptx->write_size); -memcpy (&(pxmitframe->attrib), &(pmptx->attrib),sizeof (struct pkt_attrib )); +memcpy (&pxmitframe->attrib, &pmptx->attrib,sizeof (struct pkt_attrib ));dump_mpframe (padapter, pxmitframe);
@@ -625,7 +625,7 @@ static int mp_xmit_packet_thread(void *context)void fill_txdesc_for_mp (struct adapter *padapter,struct tx_desc *ptxdesc) {struct mp_priv *pmp_priv = &padapter->mppriv; -memcpy (ptxdesc, &(pmp_priv->tx.desc),TXDESC_SIZE ); +memcpy (ptxdesc, &pmp_priv->tx.desc,TXDESC_SIZE ); }void SetPacketTx (struct adapter *padapter)
@@ -676,7 +676,7 @@ void SetPacketTx(struct adapter *padapter) pmp_priv->tx.buf = (u8 *)N_BYTE_ALIGMENT ((size_t )(pmp_priv->tx.pallocated_buf),XMITBUF_ALIGN_SZ ); ptr = pmp_priv->tx.buf; - desc = &(pmp_priv->tx.desc); + desc = &pmp_priv->tx.desc;memset (desc,0 ,TXDESC_SIZE ); pkt_start = ptr; pkt_end = pkt_start + pkt_size;
@@ -954,7 +954,7 @@ void _rtw_mp_xmit_priv(struct xmit_priv *pxmitpriv) goto exit; } -list_add_tail (&pxmitbuf->list, &(pxmitpriv->free_xmit_extbuf_queue.queue)); +list_add_tail (&pxmitbuf->list, &pxmitpriv->free_xmit_extbuf_queue.queue); pxmitbuf++; }
Signature · 1 line
2.32.0