staging: rtl8723bs: remove unnecessary parentheses in ioctl_cfg80211.c
PATCH 1/1 staging: rtl8723bs: remove unnecessary parentheses in ioctl_cfg80211.c
Remove unnecessary parentheses around the right-hand side of assignments and around function arguments. This clears up all "Unnecessary parentheses" warnings reported by checkpatch.pl.
--- .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 70 +++++++++---------- 1 file changed, 35 insertions(+), 35 deletions(-)
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +35 -35
@@ -216,7 +216,7 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct adapter *padapter, struct wlstruct wireless_dev *wdev = padapter->rtw_wdev;struct wiphy *wiphy = wdev->wiphy; -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv; bssinf_len = pnetwork->network.ie_length +sizeof (struct ieee80211_hdr_3addr );if (bssinf_len >MAX_BSSINFO_LEN )
@@ -281,7 +281,7 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct adapter *padapter, struct wl pbuf = buf; pwlanhdr = (struct ieee80211_hdr *)pbuf; - fctrl = &(pwlanhdr->frame_control); + fctrl = &pwlanhdr->frame_control; *(fctrl) =0 ;SetSeqNum (pwlanhdr,0 /*pmlmeext->mgnt_seq*/ );
@@ -291,7 +291,7 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct adapter *padapter, struct wleth_broadcast_addr (pwlanhdr->addr1);SetFrameSubType (pbuf,WIFI_BEACON ); }else { -memcpy (pwlanhdr->addr1,myid (&(padapter->eeprompriv)),ETH_ALEN ); +memcpy (pwlanhdr->addr1,myid (&padapter->eeprompriv),ETH_ALEN );SetFrameSubType (pbuf,WIFI_PROBERSP ); }
@@ -328,7 +328,7 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct adapter *padapter, struct wl*/ int rtw_cfg80211_check_bss (struct adapter *padapter) { -struct wlan_bssid_ex *pnetwork = &(padapter->mlmeextpriv.mlmext_info.network); +struct wlan_bssid_ex *pnetwork = &padapter->mlmeextpriv.mlmext_info.network;struct cfg80211_bss *bss =NULL ;struct ieee80211_channel *notify_channel =NULL ;u32 freq;
@@ -352,7 +352,7 @@ int rtw_cfg80211_check_bss(struct adapter *padapter)void rtw_cfg80211_ibss_indicate_connect (struct adapter *padapter) {struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct wlan_network *cur_network = &(pmlmepriv->cur_network); +struct wlan_network *cur_network = &pmlmepriv->cur_network;struct wireless_dev *pwdev = padapter->rtw_wdev;struct wiphy *wiphy = pwdev->wiphy;int freq = (int )cur_network->network.configuration.ds_config;
@@ -362,7 +362,7 @@ void rtw_cfg80211_ibss_indicate_connect(struct adapter *padapter)return ;if (!rtw_cfg80211_check_bss (padapter)) { -struct wlan_bssid_ex *pnetwork = &(padapter->mlmeextpriv.mlmext_info.network); +struct wlan_bssid_ex *pnetwork = &padapter->mlmeextpriv.mlmext_info.network;struct wlan_network *scanned = pmlmepriv->cur_network_scanned;if (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE )) {
@@ -394,7 +394,7 @@ void rtw_cfg80211_ibss_indicate_connect(struct adapter *padapter)void rtw_cfg80211_indicate_connect (struct adapter *padapter) {struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct wlan_network *cur_network = &(pmlmepriv->cur_network); +struct wlan_network *cur_network = &pmlmepriv->cur_network;struct wireless_dev *pwdev = padapter->rtw_wdev; if (pwdev->iftype != NL80211_IFTYPE_STATION
@@ -407,7 +407,7 @@ void rtw_cfg80211_indicate_connect(struct adapter *padapter)return ; { -struct wlan_bssid_ex *pnetwork = &(padapter->mlmeextpriv.mlmext_info.network); +struct wlan_bssid_ex *pnetwork = &padapter->mlmeextpriv.mlmext_info.network;struct wlan_network *scanned = pmlmepriv->cur_network_scanned;if (!scanned) {
@@ -493,7 +493,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pastruct sta_info *psta =NULL , *pbcmc_sta =NULL ;struct adapter *padapter =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;char *grpkey = padapter->securitypriv.dot118021XGrpKey[param->u.crypt.idx].skey;char *txkey = padapter->securitypriv.dot118021XGrptxmickey[param->u.crypt.idx].skey;
@@ -552,7 +552,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa psecuritypriv->dot11PrivacyKeyIndex = wep_key_idx; } -memcpy (&(psecuritypriv->dot11DefKey[wep_key_idx].skey[0 ]), param->u.crypt.key, wep_key_len); +memcpy (&psecuritypriv->dot11DefKey[wep_key_idx].skey[0 ], param->u.crypt.key, wep_key_len); psecuritypriv->dot11DefKeylen[wep_key_idx] = wep_key_len;
@@ -578,8 +578,8 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pamemcpy (grpkey, param->u.crypt.key, (param->u.crypt.key_len >16 ?16 : param->u.crypt.key_len));/* set mic key */ -memcpy (txkey, &(param->u.crypt.key[16 ]),8 ); -memcpy (rxkey, &(param->u.crypt.key[24 ]),8 ); +memcpy (txkey, ¶m->u.crypt.key[16 ],8 ); +memcpy (rxkey, ¶m->u.crypt.key[24 ],8 ); psecuritypriv->busetkipkey = true;
@@ -622,8 +622,8 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa 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;
@@ -652,8 +652,8 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pamemcpy (grpkey, param->u.crypt.key, (param->u.crypt.key_len >16 ?16 : param->u.crypt.key_len));/* set mic key */ -memcpy (txkey, &(param->u.crypt.key[16 ]),8 ); -memcpy (rxkey, &(param->u.crypt.key[24 ]),8 ); +memcpy (txkey, ¶m->u.crypt.key[16 ],8 ); +memcpy (rxkey, ¶m->u.crypt.key[24 ],8 ); psecuritypriv->busetkipkey = true;
@@ -748,7 +748,7 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_param psecuritypriv->dot11PrivacyKeyIndex = wep_key_idx; } -memcpy (&(psecuritypriv->dot11DefKey[wep_key_idx].skey[0 ]), param->u.crypt.key, wep_key_len); +memcpy (&psecuritypriv->dot11DefKey[wep_key_idx].skey[0 ], param->u.crypt.key, wep_key_len); psecuritypriv->dot11DefKeylen[wep_key_idx] = wep_key_len;
@@ -778,8 +778,8 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_parammemcpy (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;/* _set_timer(&padapter->securitypriv.tkip_timer, 50); */
@@ -789,8 +789,8 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_param }else {/* group key */ if (strcmp (param->u.crypt.alg,"TKIP" ) ==0 ||strcmp (param->u.crypt.alg,"CCMP" ) ==0 ) {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; padapter->securitypriv.dot118021XGrpKeyid = param->u.crypt.idx;
@@ -981,7 +981,7 @@ static int cfg80211_rtw_get_station(struct wiphy *wiphy,/* for infra./P2PClient mode */ if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ) &&check_fwstate (pmlmepriv, _FW_LINKED)) { -struct wlan_network *cur_network = &(pmlmepriv->cur_network); +struct wlan_network *cur_network = &pmlmepriv->cur_network;if (memcmp ((u8 *)mac, cur_network->network.mac_address,ETH_ALEN )) { ret = -ENOENT ;
@@ -1022,7 +1022,7 @@ static int cfg80211_rtw_change_iface(struct wiphy *wiphy,enum nl80211_iftype old_type;struct adapter *padapter =rtw_netdev_priv (ndev);struct wireless_dev *rtw_wdev = padapter->rtw_wdev; -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;int ret =0 ;if (adapter_to_dvobj (padapter)->processing_dev_remove) {
@@ -1111,11 +1111,11 @@ void rtw_cfg80211_unlink_bss(struct adapter *padapter, struct wlan_network *pnetvoid rtw_cfg80211_surveydone_event_callback (struct adapter *padapter) {struct list_head *plist, *phead; -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 ; -spin_lock_bh (&(pmlmepriv->scanned_queue.lock)); +spin_lock_bh (&pmlmepriv->scanned_queue.lock); phead =get_list_head (queue);list_for_each (plist, phead)
@@ -1124,13 +1124,13 @@ void rtw_cfg80211_surveydone_event_callback(struct adapter *padapter)/* report network only if the current channel set contains the channel to which this network belongs */ if (rtw_ch_set_search_ch (padapter->mlmeextpriv.channel_set, pnetwork->network.configuration.ds_config) >=0 - && true ==rtw_validate_ssid (&(pnetwork->network.ssid))) { + && true ==rtw_validate_ssid (&pnetwork->network.ssid)) {/* ev =translate_scan(padapter, a, pnetwork, ev, stop); */ rtw_cfg80211_inform_bss (padapter, pnetwork); } } -spin_unlock_bh (&(pmlmepriv->scanned_queue.lock)); +spin_unlock_bh (&pmlmepriv->scanned_queue.lock); }static int rtw_cfg80211_set_probe_req_wpsp2pie (struct adapter *padapter,char *buf,int len)
@@ -1138,7 +1138,7 @@ static int rtw_cfg80211_set_probe_req_wpsp2pie(struct adapter *padapter, char *bint ret =0 ;unsigned int wps_ielen =0 ;u8 *wps_ie; -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;if (len >0 ) { wps_ie =rtw_get_wps_ie (buf, len,NULL , &wps_ielen);
@@ -2058,8 +2058,8 @@ static netdev_tx_t rtw_cfg80211_monitor_if_xmit_entry(struct sk_buff *skb, struc/* u8 category, action, OUI_Subtype, dialogToken = 0; */ /* unsigned char *frame_body; */ struct ieee80211_hdr *pwlanhdr; -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 *buf = skb->data;u32 len = skb->len;u8 category, action;
@@ -2244,7 +2244,7 @@ static int rtw_add_beacon(struct adapter *adapter, const u8 *head, size_t head_lint ret =0 ;u8 *pbuf =NULL ;unsigned int len, wps_ielen =0 ; -struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); +struct mlme_priv *pmlmepriv = &adapter->mlmepriv;if (!check_fwstate (pmlmepriv,WIFI_AP_STATE ))return -EINVAL ;
@@ -2336,7 +2336,7 @@ static int cfg80211_rtw_del_station(struct wiphy *wiphy,u8 updated = false;struct sta_info *psta =NULL ;struct adapter *padapter =rtw_netdev_priv (wdev->netdev); -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct sta_priv *pstapriv = &padapter->stapriv;const u8 *mac = params->mac;
@@ -2461,8 +2461,8 @@ static int _cfg80211_rtw_mgmt_tx(struct adapter *padapter, u8 tx_ch, const u8 *bint ret = _FAIL;bool __maybe_unused ack = true;struct ieee80211_hdr *pwlanhdr; -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;rtw_set_scan_deny (padapter,1000 );
--
2.55.0
Greg KH
maintainerQuoted 5 lines · Romeu G
Remove unnecessary parentheses around the right-hand side of assignments and around function arguments. This clears up all "Unnecessary parentheses" warnings reported by checkpatch.pl.
Signed-off-by Romeu G <[email protected]>
Full name please.
thanks,
greg k-h
Hi Greg,
Thanks. I will resend this with my full name.
Thanks,
Romeu Gomes
PATCH v2 1/1 staging: rtl8723bs: remove unnecessary parentheses in ioctl_cfg80211.c
In reply to Greg KHRemove unnecessary parentheses around the right-hand side of assignments and around function arguments. This clears up all "Unnecessary parentheses" warnings reported by checkpatch.pl.
---
Changes in v2:
- Corrected name in Signed-off-by tag.
.../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 70 +++++++++---------- 1 file changed, 35 insertions(+), 35 deletions(-)
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +35 -35
@@ -216,7 +216,7 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct adapter *padapter, struct wlstruct wireless_dev *wdev = padapter->rtw_wdev;struct wiphy *wiphy = wdev->wiphy; -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv; bssinf_len = pnetwork->network.ie_length +sizeof (struct ieee80211_hdr_3addr );if (bssinf_len >MAX_BSSINFO_LEN )
@@ -281,7 +281,7 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct adapter *padapter, struct wl pbuf = buf; pwlanhdr = (struct ieee80211_hdr *)pbuf; - fctrl = &(pwlanhdr->frame_control); + fctrl = &pwlanhdr->frame_control; *(fctrl) =0 ;SetSeqNum (pwlanhdr,0 /*pmlmeext->mgnt_seq*/ );
@@ -291,7 +291,7 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct adapter *padapter, struct wleth_broadcast_addr (pwlanhdr->addr1);SetFrameSubType (pbuf,WIFI_BEACON ); }else { -memcpy (pwlanhdr->addr1,myid (&(padapter->eeprompriv)),ETH_ALEN ); +memcpy (pwlanhdr->addr1,myid (&padapter->eeprompriv),ETH_ALEN );SetFrameSubType (pbuf,WIFI_PROBERSP ); }
@@ -328,7 +328,7 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct adapter *padapter, struct wl*/ int rtw_cfg80211_check_bss (struct adapter *padapter) { -struct wlan_bssid_ex *pnetwork = &(padapter->mlmeextpriv.mlmext_info.network); +struct wlan_bssid_ex *pnetwork = &padapter->mlmeextpriv.mlmext_info.network;struct cfg80211_bss *bss =NULL ;struct ieee80211_channel *notify_channel =NULL ;u32 freq;
@@ -352,7 +352,7 @@ int rtw_cfg80211_check_bss(struct adapter *padapter)void rtw_cfg80211_ibss_indicate_connect (struct adapter *padapter) {struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct wlan_network *cur_network = &(pmlmepriv->cur_network); +struct wlan_network *cur_network = &pmlmepriv->cur_network;struct wireless_dev *pwdev = padapter->rtw_wdev;struct wiphy *wiphy = pwdev->wiphy;int freq = (int )cur_network->network.configuration.ds_config;
@@ -362,7 +362,7 @@ void rtw_cfg80211_ibss_indicate_connect(struct adapter *padapter)return ;if (!rtw_cfg80211_check_bss (padapter)) { -struct wlan_bssid_ex *pnetwork = &(padapter->mlmeextpriv.mlmext_info.network); +struct wlan_bssid_ex *pnetwork = &padapter->mlmeextpriv.mlmext_info.network;struct wlan_network *scanned = pmlmepriv->cur_network_scanned;if (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE )) {
@@ -394,7 +394,7 @@ void rtw_cfg80211_ibss_indicate_connect(struct adapter *padapter)void rtw_cfg80211_indicate_connect (struct adapter *padapter) {struct mlme_priv *pmlmepriv = &padapter->mlmepriv; -struct wlan_network *cur_network = &(pmlmepriv->cur_network); +struct wlan_network *cur_network = &pmlmepriv->cur_network;struct wireless_dev *pwdev = padapter->rtw_wdev; if (pwdev->iftype != NL80211_IFTYPE_STATION
@@ -407,7 +407,7 @@ void rtw_cfg80211_indicate_connect(struct adapter *padapter)return ; { -struct wlan_bssid_ex *pnetwork = &(padapter->mlmeextpriv.mlmext_info.network); +struct wlan_bssid_ex *pnetwork = &padapter->mlmeextpriv.mlmext_info.network;struct wlan_network *scanned = pmlmepriv->cur_network_scanned;if (!scanned) {
@@ -493,7 +493,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pastruct sta_info *psta =NULL , *pbcmc_sta =NULL ;struct adapter *padapter =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;char *grpkey = padapter->securitypriv.dot118021XGrpKey[param->u.crypt.idx].skey;char *txkey = padapter->securitypriv.dot118021XGrptxmickey[param->u.crypt.idx].skey;
@@ -552,7 +552,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa psecuritypriv->dot11PrivacyKeyIndex = wep_key_idx; } -memcpy (&(psecuritypriv->dot11DefKey[wep_key_idx].skey[0 ]), param->u.crypt.key, wep_key_len); +memcpy (&psecuritypriv->dot11DefKey[wep_key_idx].skey[0 ], param->u.crypt.key, wep_key_len); psecuritypriv->dot11DefKeylen[wep_key_idx] = wep_key_len;
@@ -578,8 +578,8 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pamemcpy (grpkey, param->u.crypt.key, (param->u.crypt.key_len >16 ?16 : param->u.crypt.key_len));/* set mic key */ -memcpy (txkey, &(param->u.crypt.key[16 ]),8 ); -memcpy (rxkey, &(param->u.crypt.key[24 ]),8 ); +memcpy (txkey, ¶m->u.crypt.key[16 ],8 ); +memcpy (rxkey, ¶m->u.crypt.key[24 ],8 ); psecuritypriv->busetkipkey = true;
@@ -622,8 +622,8 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa 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;
@@ -652,8 +652,8 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pamemcpy (grpkey, param->u.crypt.key, (param->u.crypt.key_len >16 ?16 : param->u.crypt.key_len));/* set mic key */ -memcpy (txkey, &(param->u.crypt.key[16 ]),8 ); -memcpy (rxkey, &(param->u.crypt.key[24 ]),8 ); +memcpy (txkey, ¶m->u.crypt.key[16 ],8 ); +memcpy (rxkey, ¶m->u.crypt.key[24 ],8 ); psecuritypriv->busetkipkey = true;
@@ -748,7 +748,7 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_param psecuritypriv->dot11PrivacyKeyIndex = wep_key_idx; } -memcpy (&(psecuritypriv->dot11DefKey[wep_key_idx].skey[0 ]), param->u.crypt.key, wep_key_len); +memcpy (&psecuritypriv->dot11DefKey[wep_key_idx].skey[0 ], param->u.crypt.key, wep_key_len); psecuritypriv->dot11DefKeylen[wep_key_idx] = wep_key_len;
@@ -778,8 +778,8 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_parammemcpy (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;/* _set_timer(&padapter->securitypriv.tkip_timer, 50); */
@@ -789,8 +789,8 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_param }else {/* group key */ if (strcmp (param->u.crypt.alg,"TKIP" ) ==0 ||strcmp (param->u.crypt.alg,"CCMP" ) ==0 ) {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; padapter->securitypriv.dot118021XGrpKeyid = param->u.crypt.idx;
@@ -981,7 +981,7 @@ static int cfg80211_rtw_get_station(struct wiphy *wiphy,/* for infra./P2PClient mode */ if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ) &&check_fwstate (pmlmepriv, _FW_LINKED)) { -struct wlan_network *cur_network = &(pmlmepriv->cur_network); +struct wlan_network *cur_network = &pmlmepriv->cur_network;if (memcmp ((u8 *)mac, cur_network->network.mac_address,ETH_ALEN )) { ret = -ENOENT ;
@@ -1022,7 +1022,7 @@ static int cfg80211_rtw_change_iface(struct wiphy *wiphy,enum nl80211_iftype old_type;struct adapter *padapter =rtw_netdev_priv (ndev);struct wireless_dev *rtw_wdev = padapter->rtw_wdev; -struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); +struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;int ret =0 ;if (adapter_to_dvobj (padapter)->processing_dev_remove) {
@@ -1111,11 +1111,11 @@ void rtw_cfg80211_unlink_bss(struct adapter *padapter, struct wlan_network *pnetvoid rtw_cfg80211_surveydone_event_callback (struct adapter *padapter) {struct list_head *plist, *phead; -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 ; -spin_lock_bh (&(pmlmepriv->scanned_queue.lock)); +spin_lock_bh (&pmlmepriv->scanned_queue.lock); phead =get_list_head (queue);list_for_each (plist, phead)
@@ -1124,13 +1124,13 @@ void rtw_cfg80211_surveydone_event_callback(struct adapter *padapter)/* report network only if the current channel set contains the channel to which this network belongs */ if (rtw_ch_set_search_ch (padapter->mlmeextpriv.channel_set, pnetwork->network.configuration.ds_config) >=0 - && true ==rtw_validate_ssid (&(pnetwork->network.ssid))) { + && true ==rtw_validate_ssid (&pnetwork->network.ssid)) {/* ev =translate_scan(padapter, a, pnetwork, ev, stop); */ rtw_cfg80211_inform_bss (padapter, pnetwork); } } -spin_unlock_bh (&(pmlmepriv->scanned_queue.lock)); +spin_unlock_bh (&pmlmepriv->scanned_queue.lock); }static int rtw_cfg80211_set_probe_req_wpsp2pie (struct adapter *padapter,char *buf,int len)
@@ -1138,7 +1138,7 @@ static int rtw_cfg80211_set_probe_req_wpsp2pie(struct adapter *padapter, char *bint ret =0 ;unsigned int wps_ielen =0 ;u8 *wps_ie; -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;if (len >0 ) { wps_ie =rtw_get_wps_ie (buf, len,NULL , &wps_ielen);
@@ -2058,8 +2058,8 @@ static netdev_tx_t rtw_cfg80211_monitor_if_xmit_entry(struct sk_buff *skb, struc/* u8 category, action, OUI_Subtype, dialogToken = 0; */ /* unsigned char *frame_body; */ struct ieee80211_hdr *pwlanhdr; -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 *buf = skb->data;u32 len = skb->len;u8 category, action;
@@ -2244,7 +2244,7 @@ static int rtw_add_beacon(struct adapter *adapter, const u8 *head, size_t head_lint ret =0 ;u8 *pbuf =NULL ;unsigned int len, wps_ielen =0 ; -struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); +struct mlme_priv *pmlmepriv = &adapter->mlmepriv;if (!check_fwstate (pmlmepriv,WIFI_AP_STATE ))return -EINVAL ;
@@ -2336,7 +2336,7 @@ static int cfg80211_rtw_del_station(struct wiphy *wiphy,u8 updated = false;struct sta_info *psta =NULL ;struct adapter *padapter =rtw_netdev_priv (wdev->netdev); -struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); +struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct sta_priv *pstapriv = &padapter->stapriv;const u8 *mac = params->mac;
@@ -2461,8 +2461,8 @@ static int _cfg80211_rtw_mgmt_tx(struct adapter *padapter, u8 tx_ch, const u8 *bint ret = _FAIL;bool __maybe_unused ack = true;struct ieee80211_hdr *pwlanhdr; -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;rtw_set_scan_deny (padapter,1000 );
--
2.55.0