Skip to content

Commit 13904f9

Browse files
Franziska Naepeltgregkh
Franziska Naepelt
authored and
gregkh
committed
staging: rtl8723bs: Fix blank line issues
Fix the following checkpatch blank line issues: - CHECK: Please don't use multiple blank lines - CHECK: Blank lines aren't necessary before a close brace '}' - CHECK: Blank lines aren't necessary after an open brace '{' Signed-off-by: Franziska Naepelt <franziska.naepelt@gmail.com> Link: https://lore.kernel.org/r/20230619181246.19112-1-franziska.naepelt@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 3b64014 commit 13904f9

1 file changed

Lines changed: 0 additions & 46 deletions

File tree

‎drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c‎

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,6 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct adapter *padapter, struct wl
305305
memcpy(pwlanhdr->addr2, pnetwork->network.mac_address, ETH_ALEN);
306306
memcpy(pwlanhdr->addr3, pnetwork->network.mac_address, ETH_ALEN);
307307

308-
309308
pbuf += sizeof(struct ieee80211_hdr_3addr);
310309
len = sizeof(struct ieee80211_hdr_3addr);
311310

@@ -325,7 +324,6 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct adapter *padapter, struct wl
325324

326325
exit:
327326
return bss;
328-
329327
}
330328

331329
/*
@@ -374,7 +372,6 @@ void rtw_cfg80211_ibss_indicate_connect(struct adapter *padapter)
374372
struct wlan_network *scanned = pmlmepriv->cur_network_scanned;
375373

376374
if (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == true) {
377-
378375
memcpy(&cur_network->network, pnetwork, sizeof(struct wlan_bssid_ex));
379376
rtw_cfg80211_inform_bss(padapter, cur_network);
380377
} else {
@@ -495,7 +492,6 @@ void rtw_cfg80211_indicate_disconnect(struct adapter *padapter)
495492
}
496493
}
497494

498-
499495
static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_param *param, u32 param_len)
500496
{
501497
int ret = 0;
@@ -569,7 +565,6 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa
569565
rtw_ap_set_wep_key(padapter, param->u.crypt.key, wep_key_len, wep_key_idx, 1);
570566

571567
goto exit;
572-
573568
}
574569

575570
/* group key */
@@ -616,11 +611,9 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa
616611
pbcmc_sta->ieee8021x_blocked = false;
617612
pbcmc_sta->dot118021XPrivacy = psecuritypriv->dot118021XGrpPrivacy;/* rx will use bmc_sta's dot118021XPrivacy */
618613
}
619-
620614
}
621615

622616
goto exit;
623-
624617
}
625618

626619
if (psecuritypriv->dot11AuthAlgrthm == dot11AuthAlgrthm_8021X && psta) { /* psk/802_1x */
@@ -643,7 +636,6 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa
643636
psecuritypriv->busetkipkey = true;
644637

645638
} else if (strcmp(param->u.crypt.alg, "CCMP") == 0) {
646-
647639
psta->dot118021XPrivacy = _AES_;
648640
} else {
649641
psta->dot118021XPrivacy = _NO_PRIVACY_;
@@ -695,17 +687,13 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa
695687
pbcmc_sta->ieee8021x_blocked = false;
696688
pbcmc_sta->dot118021XPrivacy = psecuritypriv->dot118021XGrpPrivacy;/* rx will use bmc_sta's dot118021XPrivacy */
697689
}
698-
699690
}
700-
701691
}
702-
703692
}
704693

705694
exit:
706695

707696
return ret;
708-
709697
}
710698

711699
static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_param *param, u32 param_len)
@@ -789,7 +777,6 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_param
789777
if (strcmp(param->u.crypt.alg, "none") != 0)
790778
psta->ieee8021x_blocked = false;
791779

792-
793780
if ((padapter->securitypriv.ndisencryptstatus == Ndis802_11Encryption2Enabled) ||
794781
(padapter->securitypriv.ndisencryptstatus == Ndis802_11Encryption3Enabled)) {
795782
psta->dot118021XPrivacy = padapter->securitypriv.dot11PrivacyAlgrthm;
@@ -900,7 +887,6 @@ static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev,
900887

901888
strncpy((char *)param->u.crypt.alg, alg_name, IEEE_CRYPT_ALG_NAME_LEN);
902889

903-
904890
if (!mac_addr || is_broadcast_ether_addr(mac_addr))
905891
param->u.crypt.set_tx = 0; /* for wpa/wpa2 group key */
906892
else
@@ -932,7 +918,6 @@ static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev,
932918
kfree(param);
933919

934920
return ret;
935-
936921
}
937922

938923
static int cfg80211_rtw_get_key(struct wiphy *wiphy, struct net_device *ndev,
@@ -983,7 +968,6 @@ static int cfg80211_rtw_set_default_key(struct wiphy *wiphy,
983968
}
984969

985970
return 0;
986-
987971
}
988972

989973
static int cfg80211_rtw_get_station(struct wiphy *wiphy,
@@ -1168,7 +1152,6 @@ void rtw_cfg80211_surveydone_event_callback(struct adapter *padapter)
11681152
/* ev =translate_scan(padapter, a, pnetwork, ev, stop); */
11691153
rtw_cfg80211_inform_bss(padapter, pnetwork);
11701154
}
1171-
11721155
}
11731156

11741157
spin_unlock_bh(&(pmlmepriv->scanned_queue.lock));
@@ -1200,7 +1183,6 @@ static int rtw_cfg80211_set_probe_req_wpsp2pie(struct adapter *padapter, char *b
12001183
}
12011184

12021185
return ret;
1203-
12041186
}
12051187

12061188
static int cfg80211_rtw_scan(struct wiphy *wiphy
@@ -1312,7 +1294,6 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy
13121294
}
13131295
spin_unlock_bh(&pmlmepriv->lock);
13141296

1315-
13161297
if (_status == false)
13171298
ret = -1;
13181299

@@ -1327,7 +1308,6 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy
13271308

13281309
exit:
13291310
return ret;
1330-
13311311
}
13321312

13331313
static int cfg80211_rtw_set_wiphy_params(struct wiphy *wiphy, u32 changed)
@@ -1342,12 +1322,10 @@ static int rtw_cfg80211_set_wpa_version(struct security_priv *psecuritypriv, u32
13421322
return 0;
13431323
}
13441324

1345-
13461325
if (wpa_version & (NL80211_WPA_VERSION_1 | NL80211_WPA_VERSION_2))
13471326
psecuritypriv->ndisauthtype = Ndis802_11AuthModeWPAPSK;
13481327

13491328
return 0;
1350-
13511329
}
13521330

13531331
static int rtw_cfg80211_set_auth_type(struct security_priv *psecuritypriv,
@@ -1373,15 +1351,13 @@ static int rtw_cfg80211_set_auth_type(struct security_priv *psecuritypriv,
13731351

13741352
psecuritypriv->ndisencryptstatus = Ndis802_11Encryption1Enabled;
13751353

1376-
13771354
break;
13781355
default:
13791356
psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Open;
13801357
/* return -ENOTSUPP; */
13811358
}
13821359

13831360
return 0;
1384-
13851361
}
13861362

13871363
static int rtw_cfg80211_set_cipher(struct security_priv *psecuritypriv, u32 cipher, bool ucast)
@@ -1391,7 +1367,6 @@ static int rtw_cfg80211_set_cipher(struct security_priv *psecuritypriv, u32 ciph
13911367
u32 *profile_cipher = ucast ? &psecuritypriv->dot11PrivacyAlgrthm :
13921368
&psecuritypriv->dot118021XGrpPrivacy;
13931369

1394-
13951370
if (!cipher) {
13961371
*profile_cipher = _NO_PRIVACY_;
13971372
psecuritypriv->ndisencryptstatus = ndisencryptstatus;
@@ -1603,7 +1578,6 @@ static int cfg80211_rtw_join_ibss(struct wiphy *wiphy, struct net_device *ndev,
16031578
}
16041579

16051580
if (params->ssid_len > IW_ESSID_MAX_SIZE) {
1606-
16071581
ret = -E2BIG;
16081582
goto exit;
16091583
}
@@ -1671,7 +1645,6 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev,
16711645

16721646
padapter->mlmepriv.not_indic_disco = true;
16731647

1674-
16751648
if (adapter_wdev_data(padapter)->block == true) {
16761649
ret = -EBUSY;
16771650
goto exit;
@@ -1694,7 +1667,6 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev,
16941667
}
16951668

16961669
if (sme->ssid_len > IW_ESSID_MAX_SIZE) {
1697-
16981670
ret = -E2BIG;
16991671
goto exit;
17001672
}
@@ -1889,7 +1861,6 @@ static int cfg80211_rtw_set_pmksa(struct wiphy *wiphy,
18891861
/* overwrite PMKID */
18901862
for (index = 0 ; index < NUM_PMKID_CACHE; index++) {
18911863
if (!memcmp(psecuritypriv->PMKIDList[index].Bssid, (u8 *)pmksa->bssid, ETH_ALEN)) {
1892-
18931864
memcpy(psecuritypriv->PMKIDList[index].PMKID, (u8 *)pmksa->pmkid, WLAN_PMKID_LEN);
18941865
psecuritypriv->PMKIDList[index].bUsed = true;
18951866
psecuritypriv->PMKIDIndex = index+1;
@@ -1899,7 +1870,6 @@ static int cfg80211_rtw_set_pmksa(struct wiphy *wiphy,
18991870
}
19001871

19011872
if (!blInserted) {
1902-
19031873
memcpy(psecuritypriv->PMKIDList[psecuritypriv->PMKIDIndex].Bssid, (u8 *)pmksa->bssid, ETH_ALEN);
19041874
memcpy(psecuritypriv->PMKIDList[psecuritypriv->PMKIDIndex].PMKID, (u8 *)pmksa->pmkid, WLAN_PMKID_LEN);
19051875

@@ -2135,23 +2105,18 @@ static netdev_tx_t rtw_cfg80211_monitor_if_xmit_entry(struct sk_buff *skb, struc
21352105
pattrib->seqnum = pmlmeext->mgnt_seq;
21362106
pmlmeext->mgnt_seq++;
21372107

2138-
21392108
pattrib->last_txcmdsz = pattrib->pktlen;
21402109

21412110
dump_mgntframe(padapter, pmgntframe);
2142-
21432111
}
21442112

21452113
fail:
21462114

21472115
dev_kfree_skb_any(skb);
21482116

21492117
return NETDEV_TX_OK;
2150-
21512118
}
21522119

2153-
2154-
21552120
static const struct net_device_ops rtw_cfg80211_monitor_if_ops = {
21562121
.ndo_start_xmit = rtw_cfg80211_monitor_if_xmit_entry,
21572122
};
@@ -2324,7 +2289,6 @@ static int rtw_add_beacon(struct adapter *adapter, const u8 *head, size_t head_l
23242289
else
23252290
ret = -EINVAL;
23262291

2327-
23282292
kfree(pbuf);
23292293

23302294
return ret;
@@ -2404,7 +2368,6 @@ static int cfg80211_rtw_del_station(struct wiphy *wiphy, struct net_device *ndev
24042368
return -EINVAL;
24052369
}
24062370

2407-
24082371
spin_lock_bh(&pstapriv->asoc_list_lock);
24092372

24102373
phead = &pstapriv->asoc_list;
@@ -2423,17 +2386,14 @@ static int cfg80211_rtw_del_station(struct wiphy *wiphy, struct net_device *ndev
24232386

24242387
break;
24252388
}
2426-
24272389
}
2428-
24292390
}
24302391

24312392
spin_unlock_bh(&pstapriv->asoc_list_lock);
24322393

24332394
associated_clients_update(padapter, updated);
24342395

24352396
return ret;
2436-
24372397
}
24382398

24392399
static int cfg80211_rtw_change_station(struct wiphy *wiphy, struct net_device *ndev,
@@ -2465,7 +2425,6 @@ static struct sta_info *rtw_sta_info_get_by_idx(const int idx, struct sta_priv *
24652425
static int cfg80211_rtw_dump_station(struct wiphy *wiphy, struct net_device *ndev,
24662426
int idx, u8 *mac, struct station_info *sinfo)
24672427
{
2468-
24692428
int ret = 0;
24702429
struct adapter *padapter = rtw_netdev_priv(ndev);
24712430
struct sta_info *psta = NULL;
@@ -2568,7 +2527,6 @@ static int _cfg80211_rtw_mgmt_tx(struct adapter *padapter, u8 tx_ch, const u8 *b
25682527
exit:
25692528

25702529
return ret;
2571-
25722530
}
25732531

25742532
static int cfg80211_rtw_mgmt_tx(struct wiphy *wiphy,
@@ -2640,7 +2598,6 @@ static int cfg80211_rtw_mgmt_tx(struct wiphy *wiphy,
26402598

26412599
static void rtw_cfg80211_init_ht_capab(struct ieee80211_sta_ht_cap *ht_cap, enum nl80211_band band)
26422600
{
2643-
26442601
#define MAX_BIT_RATE_40MHZ_MCS15 300 /* Mbps */
26452602
#define MAX_BIT_RATE_40MHZ_MCS7 150 /* Mbps */
26462603

@@ -2692,12 +2649,10 @@ void rtw_cfg80211_init_wiphy(struct adapter *padapter)
26922649

26932650
/* copy mac_addr to wiphy */
26942651
memcpy(wiphy->perm_addr, padapter->eeprompriv.mac_addr, ETH_ALEN);
2695-
26962652
}
26972653

26982654
static void rtw_cfg80211_preinit_wiphy(struct adapter *padapter, struct wiphy *wiphy)
26992655
{
2700-
27012656
wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;
27022657

27032658
wiphy->max_scan_ssids = RTW_SSID_SCAN_AMOUNT;
@@ -2844,7 +2799,6 @@ int rtw_wdev_alloc(struct adapter *padapter, struct device *dev)
28442799
wiphy_free(wiphy);
28452800
exit:
28462801
return ret;
2847-
28482802
}
28492803

28502804
void rtw_wdev_free(struct wireless_dev *wdev)

0 commit comments

Comments
 (0)