mirror of https://gitee.com/openkylin/linux.git
staging: rtl8723bs: clean up switch case indentation
Move cases to align with switch indentation to fix coding style issues and clear checkpatch errors. ERROR: switch and case should be at the same indent Signed-off-by: Ross Schmidt <ross.schm.dev@gmail.com> Link: https://lore.kernel.org/r/20201110041008.15847-6-ross.schm.dev@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ross Schmidt
Greg Kroah-Hartman
parent
fa7c458672
commit
5ddd99756c
|
|
@ -664,49 +664,49 @@ static int rtw_set_wpa_ie(struct adapter *padapter, char *pie, unsigned short ie
|
|||
pairwise_cipher = WPA_CIPHER_NONE;
|
||||
|
||||
switch (group_cipher) {
|
||||
case WPA_CIPHER_NONE:
|
||||
padapter->securitypriv.dot118021XGrpPrivacy = _NO_PRIVACY_;
|
||||
padapter->securitypriv.ndisencryptstatus = Ndis802_11EncryptionDisabled;
|
||||
break;
|
||||
case WPA_CIPHER_WEP40:
|
||||
padapter->securitypriv.dot118021XGrpPrivacy = _WEP40_;
|
||||
padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled;
|
||||
break;
|
||||
case WPA_CIPHER_TKIP:
|
||||
padapter->securitypriv.dot118021XGrpPrivacy = _TKIP_;
|
||||
padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption2Enabled;
|
||||
break;
|
||||
case WPA_CIPHER_CCMP:
|
||||
padapter->securitypriv.dot118021XGrpPrivacy = _AES_;
|
||||
padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption3Enabled;
|
||||
break;
|
||||
case WPA_CIPHER_WEP104:
|
||||
padapter->securitypriv.dot118021XGrpPrivacy = _WEP104_;
|
||||
padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled;
|
||||
break;
|
||||
case WPA_CIPHER_NONE:
|
||||
padapter->securitypriv.dot118021XGrpPrivacy = _NO_PRIVACY_;
|
||||
padapter->securitypriv.ndisencryptstatus = Ndis802_11EncryptionDisabled;
|
||||
break;
|
||||
case WPA_CIPHER_WEP40:
|
||||
padapter->securitypriv.dot118021XGrpPrivacy = _WEP40_;
|
||||
padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled;
|
||||
break;
|
||||
case WPA_CIPHER_TKIP:
|
||||
padapter->securitypriv.dot118021XGrpPrivacy = _TKIP_;
|
||||
padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption2Enabled;
|
||||
break;
|
||||
case WPA_CIPHER_CCMP:
|
||||
padapter->securitypriv.dot118021XGrpPrivacy = _AES_;
|
||||
padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption3Enabled;
|
||||
break;
|
||||
case WPA_CIPHER_WEP104:
|
||||
padapter->securitypriv.dot118021XGrpPrivacy = _WEP104_;
|
||||
padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled;
|
||||
break;
|
||||
}
|
||||
|
||||
switch (pairwise_cipher) {
|
||||
case WPA_CIPHER_NONE:
|
||||
padapter->securitypriv.dot11PrivacyAlgrthm = _NO_PRIVACY_;
|
||||
padapter->securitypriv.ndisencryptstatus = Ndis802_11EncryptionDisabled;
|
||||
break;
|
||||
case WPA_CIPHER_WEP40:
|
||||
padapter->securitypriv.dot11PrivacyAlgrthm = _WEP40_;
|
||||
padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled;
|
||||
break;
|
||||
case WPA_CIPHER_TKIP:
|
||||
padapter->securitypriv.dot11PrivacyAlgrthm = _TKIP_;
|
||||
padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption2Enabled;
|
||||
break;
|
||||
case WPA_CIPHER_CCMP:
|
||||
padapter->securitypriv.dot11PrivacyAlgrthm = _AES_;
|
||||
padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption3Enabled;
|
||||
break;
|
||||
case WPA_CIPHER_WEP104:
|
||||
padapter->securitypriv.dot11PrivacyAlgrthm = _WEP104_;
|
||||
padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled;
|
||||
break;
|
||||
case WPA_CIPHER_NONE:
|
||||
padapter->securitypriv.dot11PrivacyAlgrthm = _NO_PRIVACY_;
|
||||
padapter->securitypriv.ndisencryptstatus = Ndis802_11EncryptionDisabled;
|
||||
break;
|
||||
case WPA_CIPHER_WEP40:
|
||||
padapter->securitypriv.dot11PrivacyAlgrthm = _WEP40_;
|
||||
padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled;
|
||||
break;
|
||||
case WPA_CIPHER_TKIP:
|
||||
padapter->securitypriv.dot11PrivacyAlgrthm = _TKIP_;
|
||||
padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption2Enabled;
|
||||
break;
|
||||
case WPA_CIPHER_CCMP:
|
||||
padapter->securitypriv.dot11PrivacyAlgrthm = _AES_;
|
||||
padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption3Enabled;
|
||||
break;
|
||||
case WPA_CIPHER_WEP104:
|
||||
padapter->securitypriv.dot11PrivacyAlgrthm = _WEP104_;
|
||||
padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled;
|
||||
break;
|
||||
}
|
||||
|
||||
_clr_fwstate_(&padapter->mlmepriv, WIFI_UNDER_WPS);
|
||||
|
|
@ -860,28 +860,27 @@ static int rtw_wx_set_mode(struct net_device *dev, struct iw_request_info *a,
|
|||
}
|
||||
|
||||
switch (wrqu->mode) {
|
||||
case IW_MODE_AUTO:
|
||||
networkType = Ndis802_11AutoUnknown;
|
||||
DBG_871X("set_mode = IW_MODE_AUTO\n");
|
||||
break;
|
||||
case IW_MODE_ADHOC:
|
||||
networkType = Ndis802_11IBSS;
|
||||
DBG_871X("set_mode = IW_MODE_ADHOC\n");
|
||||
break;
|
||||
case IW_MODE_MASTER:
|
||||
networkType = Ndis802_11APMode;
|
||||
DBG_871X("set_mode = IW_MODE_MASTER\n");
|
||||
/* rtw_setopmode_cmd(padapter, networkType, true); */
|
||||
break;
|
||||
case IW_MODE_INFRA:
|
||||
networkType = Ndis802_11Infrastructure;
|
||||
DBG_871X("set_mode = IW_MODE_INFRA\n");
|
||||
break;
|
||||
|
||||
default:
|
||||
ret = -EINVAL;
|
||||
RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_err_, ("\n Mode: %s is not supported \n", iw_operation_mode[wrqu->mode]));
|
||||
goto exit;
|
||||
case IW_MODE_AUTO:
|
||||
networkType = Ndis802_11AutoUnknown;
|
||||
DBG_871X("set_mode = IW_MODE_AUTO\n");
|
||||
break;
|
||||
case IW_MODE_ADHOC:
|
||||
networkType = Ndis802_11IBSS;
|
||||
DBG_871X("set_mode = IW_MODE_ADHOC\n");
|
||||
break;
|
||||
case IW_MODE_MASTER:
|
||||
networkType = Ndis802_11APMode;
|
||||
DBG_871X("set_mode = IW_MODE_MASTER\n");
|
||||
/* rtw_setopmode_cmd(padapter, networkType, true); */
|
||||
break;
|
||||
case IW_MODE_INFRA:
|
||||
networkType = Ndis802_11Infrastructure;
|
||||
DBG_871X("set_mode = IW_MODE_INFRA\n");
|
||||
break;
|
||||
default:
|
||||
ret = -EINVAL;
|
||||
RT_TRACE(_module_rtl871x_ioctl_os_c, _drv_err_, ("\n Mode: %s is not supported \n", iw_operation_mode[wrqu->mode]));
|
||||
goto exit;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -1342,50 +1341,50 @@ static int rtw_wx_set_scan(struct net_device *dev, struct iw_request_info *a,
|
|||
section = *(pos++); len -= 1;
|
||||
|
||||
switch (section) {
|
||||
case WEXT_CSCAN_SSID_SECTION:
|
||||
/* DBG_871X("WEXT_CSCAN_SSID_SECTION\n"); */
|
||||
if (len < 1) {
|
||||
len = 0;
|
||||
break;
|
||||
}
|
||||
|
||||
sec_len = *(pos++); len -= 1;
|
||||
|
||||
if (sec_len > 0 && sec_len <= len) {
|
||||
ssid[ssid_index].SsidLength = sec_len;
|
||||
memcpy(ssid[ssid_index].Ssid, pos, ssid[ssid_index].SsidLength);
|
||||
/* DBG_871X("%s COMBO_SCAN with specific ssid:%s, %d\n", __func__ */
|
||||
/* , ssid[ssid_index].Ssid, ssid[ssid_index].SsidLength); */
|
||||
ssid_index++;
|
||||
}
|
||||
|
||||
pos += sec_len; len -= sec_len;
|
||||
case WEXT_CSCAN_SSID_SECTION:
|
||||
/* DBG_871X("WEXT_CSCAN_SSID_SECTION\n"); */
|
||||
if (len < 1) {
|
||||
len = 0;
|
||||
break;
|
||||
}
|
||||
|
||||
sec_len = *(pos++); len -= 1;
|
||||
|
||||
if (sec_len > 0 && sec_len <= len) {
|
||||
ssid[ssid_index].SsidLength = sec_len;
|
||||
memcpy(ssid[ssid_index].Ssid, pos, ssid[ssid_index].SsidLength);
|
||||
/* DBG_871X("%s COMBO_SCAN with specific ssid:%s, %d\n", __func__ */
|
||||
/* , ssid[ssid_index].Ssid, ssid[ssid_index].SsidLength); */
|
||||
ssid_index++;
|
||||
}
|
||||
|
||||
pos += sec_len; len -= sec_len;
|
||||
break;
|
||||
|
||||
|
||||
case WEXT_CSCAN_CHANNEL_SECTION:
|
||||
/* DBG_871X("WEXT_CSCAN_CHANNEL_SECTION\n"); */
|
||||
pos += 1; len -= 1;
|
||||
break;
|
||||
case WEXT_CSCAN_ACTV_DWELL_SECTION:
|
||||
/* DBG_871X("WEXT_CSCAN_ACTV_DWELL_SECTION\n"); */
|
||||
pos += 2; len -= 2;
|
||||
break;
|
||||
case WEXT_CSCAN_PASV_DWELL_SECTION:
|
||||
/* DBG_871X("WEXT_CSCAN_PASV_DWELL_SECTION\n"); */
|
||||
pos += 2; len -= 2;
|
||||
break;
|
||||
case WEXT_CSCAN_HOME_DWELL_SECTION:
|
||||
/* DBG_871X("WEXT_CSCAN_HOME_DWELL_SECTION\n"); */
|
||||
pos += 2; len -= 2;
|
||||
break;
|
||||
case WEXT_CSCAN_TYPE_SECTION:
|
||||
/* DBG_871X("WEXT_CSCAN_TYPE_SECTION\n"); */
|
||||
pos += 1; len -= 1;
|
||||
break;
|
||||
default:
|
||||
/* DBG_871X("Unknown CSCAN section %c\n", section); */
|
||||
len = 0; /* stop parsing */
|
||||
case WEXT_CSCAN_CHANNEL_SECTION:
|
||||
/* DBG_871X("WEXT_CSCAN_CHANNEL_SECTION\n"); */
|
||||
pos += 1; len -= 1;
|
||||
break;
|
||||
case WEXT_CSCAN_ACTV_DWELL_SECTION:
|
||||
/* DBG_871X("WEXT_CSCAN_ACTV_DWELL_SECTION\n"); */
|
||||
pos += 2; len -= 2;
|
||||
break;
|
||||
case WEXT_CSCAN_PASV_DWELL_SECTION:
|
||||
/* DBG_871X("WEXT_CSCAN_PASV_DWELL_SECTION\n"); */
|
||||
pos += 2; len -= 2;
|
||||
break;
|
||||
case WEXT_CSCAN_HOME_DWELL_SECTION:
|
||||
/* DBG_871X("WEXT_CSCAN_HOME_DWELL_SECTION\n"); */
|
||||
pos += 2; len -= 2;
|
||||
break;
|
||||
case WEXT_CSCAN_TYPE_SECTION:
|
||||
/* DBG_871X("WEXT_CSCAN_TYPE_SECTION\n"); */
|
||||
pos += 1; len -= 1;
|
||||
break;
|
||||
default:
|
||||
/* DBG_871X("Unknown CSCAN section %c\n", section); */
|
||||
len = 0; /* stop parsing */
|
||||
}
|
||||
/* DBG_871X("len:%d\n", len); */
|
||||
|
||||
|
|
@ -1917,15 +1916,15 @@ static int rtw_wx_set_enc(struct net_device *dev,
|
|||
DBG_871X("(keyindex_provided == 1), keyid =%d, key_len =%d\n", key, padapter->securitypriv.dot11DefKeylen[key]);
|
||||
|
||||
switch (padapter->securitypriv.dot11DefKeylen[key]) {
|
||||
case 5:
|
||||
padapter->securitypriv.dot11PrivacyAlgrthm = _WEP40_;
|
||||
break;
|
||||
case 13:
|
||||
padapter->securitypriv.dot11PrivacyAlgrthm = _WEP104_;
|
||||
break;
|
||||
default:
|
||||
padapter->securitypriv.dot11PrivacyAlgrthm = _NO_PRIVACY_;
|
||||
break;
|
||||
case 5:
|
||||
padapter->securitypriv.dot11PrivacyAlgrthm = _WEP40_;
|
||||
break;
|
||||
case 13:
|
||||
padapter->securitypriv.dot11PrivacyAlgrthm = _WEP104_;
|
||||
break;
|
||||
default:
|
||||
padapter->securitypriv.dot11PrivacyAlgrthm = _NO_PRIVACY_;
|
||||
break;
|
||||
}
|
||||
|
||||
goto exit;
|
||||
|
|
|
|||
|
|
@ -400,17 +400,17 @@ u16 rtw_recv_select_queue(struct sk_buff *skb)
|
|||
memcpy(ð_type, pdata + (ETH_ALEN << 1), 2);
|
||||
|
||||
switch (be16_to_cpu(eth_type)) {
|
||||
case ETH_P_IP:
|
||||
case ETH_P_IP:
|
||||
|
||||
piphdr = (struct iphdr *)(pdata + ETH_HLEN);
|
||||
piphdr = (struct iphdr *)(pdata + ETH_HLEN);
|
||||
|
||||
dscp = piphdr->tos & 0xfc;
|
||||
dscp = piphdr->tos & 0xfc;
|
||||
|
||||
priority = dscp >> 5;
|
||||
priority = dscp >> 5;
|
||||
|
||||
break;
|
||||
default:
|
||||
priority = 0;
|
||||
break;
|
||||
default:
|
||||
priority = 0;
|
||||
}
|
||||
|
||||
return rtw_1d_to_queue[priority];
|
||||
|
|
|
|||
Loading…
Reference in New Issue