Skip to content

L
linux
Commit 2dd67029 authored by Puranjay Mohan's avatar Puranjay Mohan Committed by Greg Kroah-Hartman
Browse files
Options

Staging: rtl8723bs: os_dep: Fix switch-case indentation error 

Fix indentation for switch-case statements to fix following
checkpatch.pl Error:
ERROR: switch and case should be at the same indent
Signed-off-by: default avatarPuranjay Mohan <puranjay12@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f0f74b45
Hide whitespace changes
Inline Side-by-side
Showing with 221 additions and 221 deletions
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
View file @ 2dd67029
...@@ -1671,45 +1671,45 @@ static int rtw_wx_set_rate(struct net_device *dev, ...@@ -1671,45 +1671,45 @@ static int rtw_wx_set_rate(struct net_device *dev,
target_rate = target_rate/100000; target_rate = target_rate/100000;
switch (target_rate) { switch (target_rate) {
case 10: case 10:
ratevalue = 0; ratevalue = 0;
break; break;
case 20: case 20:
ratevalue = 1; ratevalue = 1;
break; break;
case 55: case 55:
ratevalue = 2; ratevalue = 2;
break; break;
case 60: case 60:
ratevalue = 3; ratevalue = 3;
break; break;
case 90: case 90:
ratevalue = 4; ratevalue = 4;
break; break;
case 110: case 110:
ratevalue = 5; ratevalue = 5;
break; break;
case 120: case 120:
ratevalue = 6; ratevalue = 6;
break; break;
case 180: case 180:
ratevalue = 7; ratevalue = 7;
break; break;
case 240: case 240:
ratevalue = 8; ratevalue = 8;
break; break;
case 360: case 360:
ratevalue = 9; ratevalue = 9;
break; break;
case 480: case 480:
ratevalue = 10; ratevalue = 10;
break; break;
case 540: case 540:
ratevalue = 11; ratevalue = 11;
break; break;
default: default:
ratevalue = 11; ratevalue = 11;
break; break;
} }
set_rate: set_rate:
...@@ -2267,22 +2267,22 @@ static int rtw_wx_read32(struct net_device *dev, ...@@ -2267,22 +2267,22 @@ static int rtw_wx_read32(struct net_device *dev,
sscanf(ptmp, "%d,%x", &bytes, &addr); sscanf(ptmp, "%d,%x", &bytes, &addr);
switch (bytes) { switch (bytes) {
case 1: case 1:
data32 = rtw_read8(padapter, addr); data32 = rtw_read8(padapter, addr);
sprintf(extra, "0x%02X", data32); sprintf(extra, "0x%02X", data32);
break; break;
case 2: case 2:
data32 = rtw_read16(padapter, addr); data32 = rtw_read16(padapter, addr);
sprintf(extra, "0x%04X", data32); sprintf(extra, "0x%04X", data32);
break; break;
case 4: case 4:
data32 = rtw_read32(padapter, addr); data32 = rtw_read32(padapter, addr);
sprintf(extra, "0x%08X", data32); sprintf(extra, "0x%08X", data32);
break; break;
default: default:
DBG_871X(KERN_INFO "%s: usage> read [bytes],[address(hex)]\n", __func__); DBG_871X(KERN_INFO "%s: usage> read [bytes],[address(hex)]\n", __func__);
ret = -EINVAL; ret = -EINVAL;
goto exit; goto exit;
} }
DBG_871X(KERN_INFO "%s: addr = 0x%08X data =%s\n", __func__, addr, extra); DBG_871X(KERN_INFO "%s: addr = 0x%08X data =%s\n", __func__, addr, extra);
...@@ -2309,21 +2309,21 @@ static int rtw_wx_write32(struct net_device *dev, ...@@ -2309,21 +2309,21 @@ static int rtw_wx_write32(struct net_device *dev,
sscanf(extra, "%d,%x,%x", &bytes, &addr, &data32); sscanf(extra, "%d,%x,%x", &bytes, &addr, &data32);
switch (bytes) { switch (bytes) {
case 1: case 1:
rtw_write8(padapter, addr, (u8)data32); rtw_write8(padapter, addr, (u8)data32);
DBG_871X(KERN_INFO "%s: addr = 0x%08X data = 0x%02X\n", __func__, addr, (u8)data32); DBG_871X(KERN_INFO "%s: addr = 0x%08X data = 0x%02X\n", __func__, addr, (u8)data32);
break; break;
case 2: case 2:
rtw_write16(padapter, addr, (u16)data32); rtw_write16(padapter, addr, (u16)data32);
DBG_871X(KERN_INFO "%s: addr = 0x%08X data = 0x%04X\n", __func__, addr, (u16)data32); DBG_871X(KERN_INFO "%s: addr = 0x%08X data = 0x%04X\n", __func__, addr, (u16)data32);
break; break;
case 4: case 4:
rtw_write32(padapter, addr, data32); rtw_write32(padapter, addr, data32);
DBG_871X(KERN_INFO "%s: addr = 0x%08X data = 0x%08X\n", __func__, addr, data32); DBG_871X(KERN_INFO "%s: addr = 0x%08X data = 0x%08X\n", __func__, addr, data32);
break; break;
default: default:
DBG_871X(KERN_INFO "%s: usage> write [bytes],[address(hex)],[data(hex)]\n", __func__); DBG_871X(KERN_INFO "%s: usage> write [bytes],[address(hex)],[data(hex)]\n", __func__);
return -EINVAL; return -EINVAL;
} }
return 0; return 0;
...@@ -3366,23 +3366,23 @@ static int wpa_mlme(struct net_device *dev, u32 command, u32 reason) ...@@ -3366,23 +3366,23 @@ static int wpa_mlme(struct net_device *dev, u32 command, u32 reason)
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev); struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
switch (command) { switch (command) {
case IEEE_MLME_STA_DEAUTH: case IEEE_MLME_STA_DEAUTH:
if (!rtw_set_802_11_disassociate(padapter)) if (!rtw_set_802_11_disassociate(padapter))
ret = -1; ret = -1;
break; break;
case IEEE_MLME_STA_DISASSOC: case IEEE_MLME_STA_DISASSOC:
if (!rtw_set_802_11_disassociate(padapter)) if (!rtw_set_802_11_disassociate(padapter))
ret = -1; ret = -1;
break; break;
default: default:
ret = -EOPNOTSUPP; ret = -EOPNOTSUPP;
break; break;
} }
return ret; return ret;
...@@ -4252,94 +4252,94 @@ static int rtw_hostapd_ioctl(struct net_device *dev, struct iw_point *p) ...@@ -4252,94 +4252,94 @@ static int rtw_hostapd_ioctl(struct net_device *dev, struct iw_point *p)
/* DBG_871X("%s, cmd =%d\n", __func__, param->cmd); */ /* DBG_871X("%s, cmd =%d\n", __func__, param->cmd); */
switch (param->cmd) { switch (param->cmd) {
case RTL871X_HOSTAPD_FLUSH: case RTL871X_HOSTAPD_FLUSH:
ret = rtw_hostapd_sta_flush(dev); ret = rtw_hostapd_sta_flush(dev);
break; break;
case RTL871X_HOSTAPD_ADD_STA: case RTL871X_HOSTAPD_ADD_STA:
ret = rtw_add_sta(dev, param); ret = rtw_add_sta(dev, param);
break; break;
case RTL871X_HOSTAPD_REMOVE_STA: case RTL871X_HOSTAPD_REMOVE_STA:
ret = rtw_del_sta(dev, param); ret = rtw_del_sta(dev, param);
break; break;
case RTL871X_HOSTAPD_SET_BEACON: case RTL871X_HOSTAPD_SET_BEACON:
ret = rtw_set_beacon(dev, param, p->length); ret = rtw_set_beacon(dev, param, p->length);
break; break;
case RTL871X_SET_ENCRYPTION: case RTL871X_SET_ENCRYPTION:
ret = rtw_set_encryption(dev, param, p->length); ret = rtw_set_encryption(dev, param, p->length);
break; break;
case RTL871X_HOSTAPD_GET_WPAIE_STA: case RTL871X_HOSTAPD_GET_WPAIE_STA:
ret = rtw_get_sta_wpaie(dev, param); ret = rtw_get_sta_wpaie(dev, param);
break; break;
case RTL871X_HOSTAPD_SET_WPS_BEACON: case RTL871X_HOSTAPD_SET_WPS_BEACON:
ret = rtw_set_wps_beacon(dev, param, p->length); ret = rtw_set_wps_beacon(dev, param, p->length);
break; break;
case RTL871X_HOSTAPD_SET_WPS_PROBE_RESP: case RTL871X_HOSTAPD_SET_WPS_PROBE_RESP:
ret = rtw_set_wps_probe_resp(dev, param, p->length); ret = rtw_set_wps_probe_resp(dev, param, p->length);
break; break;
case RTL871X_HOSTAPD_SET_WPS_ASSOC_RESP: case RTL871X_HOSTAPD_SET_WPS_ASSOC_RESP:
ret = rtw_set_wps_assoc_resp(dev, param, p->length); ret = rtw_set_wps_assoc_resp(dev, param, p->length);
break; break;
case RTL871X_HOSTAPD_SET_HIDDEN_SSID: case RTL871X_HOSTAPD_SET_HIDDEN_SSID:
ret = rtw_set_hidden_ssid(dev, param, p->length); ret = rtw_set_hidden_ssid(dev, param, p->length);
break; break;
case RTL871X_HOSTAPD_GET_INFO_STA: case RTL871X_HOSTAPD_GET_INFO_STA:
ret = rtw_ioctl_get_sta_data(dev, param, p->length); ret = rtw_ioctl_get_sta_data(dev, param, p->length);
break; break;
case RTL871X_HOSTAPD_SET_MACADDR_ACL: case RTL871X_HOSTAPD_SET_MACADDR_ACL:
ret = rtw_ioctl_set_macaddr_acl(dev, param, p->length); ret = rtw_ioctl_set_macaddr_acl(dev, param, p->length);
break; break;
case RTL871X_HOSTAPD_ACL_ADD_STA: case RTL871X_HOSTAPD_ACL_ADD_STA:
ret = rtw_ioctl_acl_add_sta(dev, param, p->length); ret = rtw_ioctl_acl_add_sta(dev, param, p->length);
break; break;
case RTL871X_HOSTAPD_ACL_REMOVE_STA: case RTL871X_HOSTAPD_ACL_REMOVE_STA:
ret = rtw_ioctl_acl_remove_sta(dev, param, p->length); ret = rtw_ioctl_acl_remove_sta(dev, param, p->length);
break; break;
default: default:
DBG_871X("Unknown hostapd request: %d\n", param->cmd); DBG_871X("Unknown hostapd request: %d\n", param->cmd);
ret = -EOPNOTSUPP; ret = -EOPNOTSUPP;
break; break;
} }
...@@ -5015,62 +5015,62 @@ static int rtw_ioctl_wext_private(struct net_device *dev, union iwreq_data *wrq_ ...@@ -5015,62 +5015,62 @@ static int rtw_ioctl_wext_private(struct net_device *dev, union iwreq_data *wrq_
u8 *str; u8 *str;
switch (priv_args[k].set_args & IW_PRIV_TYPE_MASK) { switch (priv_args[k].set_args & IW_PRIV_TYPE_MASK) {
case IW_PRIV_TYPE_BYTE: case IW_PRIV_TYPE_BYTE:
/* Fetch args */ /* Fetch args */
count = 0; count = 0;
do { do {
str = strsep(&ptr, delim); str = strsep(&ptr, delim);
if (NULL == str) break; if (NULL == str) break;
sscanf(str, "%i", &temp); sscanf(str, "%i", &temp);
buffer[count++] = (u8)temp; buffer[count++] = (u8)temp;
} while (1); } while (1);
buffer_len = count; buffer_len = count;
/* Number of args to fetch */ /* Number of args to fetch */
wdata.data.length = count; wdata.data.length = count;
if (wdata.data.length > (priv_args[k].set_args & IW_PRIV_SIZE_MASK)) if (wdata.data.length > (priv_args[k].set_args & IW_PRIV_SIZE_MASK))
wdata.data.length = priv_args[k].set_args & IW_PRIV_SIZE_MASK; wdata.data.length = priv_args[k].set_args & IW_PRIV_SIZE_MASK;
break; break;
case IW_PRIV_TYPE_INT: case IW_PRIV_TYPE_INT:
/* Fetch args */ /* Fetch args */
count = 0; count = 0;
do { do {
str = strsep(&ptr, delim); str = strsep(&ptr, delim);
if (NULL == str) break; if (NULL == str) break;
sscanf(str, "%i", &temp); sscanf(str, "%i", &temp);
((s32*)buffer)[count++] = (s32)temp; ((s32*)buffer)[count++] = (s32)temp;
} while (1); } while (1);
buffer_len = count * sizeof(s32); buffer_len = count * sizeof(s32);
/* Number of args to fetch */ /* Number of args to fetch */
wdata.data.length = count; wdata.data.length = count;
if (wdata.data.length > (priv_args[k].set_args & IW_PRIV_SIZE_MASK)) if (wdata.data.length > (priv_args[k].set_args & IW_PRIV_SIZE_MASK))
wdata.data.length = priv_args[k].set_args & IW_PRIV_SIZE_MASK; wdata.data.length = priv_args[k].set_args & IW_PRIV_SIZE_MASK;
break; break;
case IW_PRIV_TYPE_CHAR: case IW_PRIV_TYPE_CHAR:
if (len > 0) { if (len > 0) {
/* Size of the string to fetch */ /* Size of the string to fetch */
wdata.data.length = len; wdata.data.length = len;
if (wdata.data.length > (priv_args[k].set_args & IW_PRIV_SIZE_MASK)) if (wdata.data.length > (priv_args[k].set_args & IW_PRIV_SIZE_MASK))
wdata.data.length = priv_args[k].set_args & IW_PRIV_SIZE_MASK; wdata.data.length = priv_args[k].set_args & IW_PRIV_SIZE_MASK;
/* Fetch string */ /* Fetch string */
memcpy(buffer, ptr, wdata.data.length); memcpy(buffer, ptr, wdata.data.length);
} else { } else {
wdata.data.length = 1; wdata.data.length = 1;
buffer[0] = '\0'; buffer[0] = '\0';
} }
buffer_len = wdata.data.length; buffer_len = wdata.data.length;
break; break;
default: default:
DBG_8192C("%s: Not yet implemented...\n", __func__); DBG_8192C("%s: Not yet implemented...\n", __func__);
err = -1; err = -1;
goto exit; goto exit;
} }
if ((priv_args[k].set_args & IW_PRIV_SIZE_FIXED) && if ((priv_args[k].set_args & IW_PRIV_SIZE_FIXED) &&
...@@ -5162,43 +5162,43 @@ static int rtw_ioctl_wext_private(struct net_device *dev, union iwreq_data *wrq_ ...@@ -5162,43 +5162,43 @@ static int rtw_ioctl_wext_private(struct net_device *dev, union iwreq_data *wrq_
} }
switch (priv_args[k].get_args & IW_PRIV_TYPE_MASK) { switch (priv_args[k].get_args & IW_PRIV_TYPE_MASK) {
case IW_PRIV_TYPE_BYTE: case IW_PRIV_TYPE_BYTE:
/* Display args */ /* Display args */
for (j = 0; j < n; j++) { for (j = 0; j < n; j++) {
sprintf(str, "%d ", extra[j]); sprintf(str, "%d ", extra[j]);
len = strlen(str); len = strlen(str);
output_len = strlen(output); output_len = strlen(output);
if ((output_len + len + 1) > 4096) { if ((output_len + len + 1) > 4096) {
err = -E2BIG; err = -E2BIG;
goto exit; goto exit;
}
memcpy(output+output_len, str, len);
} }
break; memcpy(output+output_len, str, len);
}
break;
case IW_PRIV_TYPE_INT: case IW_PRIV_TYPE_INT:
/* Display args */ /* Display args */
for (j = 0; j < n; j++) { for (j = 0; j < n; j++) {
sprintf(str, "%d ", ((__s32*)extra)[j]); sprintf(str, "%d ", ((__s32*)extra)[j]);
len = strlen(str); len = strlen(str);
output_len = strlen(output); output_len = strlen(output);
if ((output_len + len + 1) > 4096) { if ((output_len + len + 1) > 4096) {
err = -E2BIG; err = -E2BIG;
goto exit; goto exit;
}
memcpy(output+output_len, str, len);
} }
break; memcpy(output+output_len, str, len);
}
break;
case IW_PRIV_TYPE_CHAR: case IW_PRIV_TYPE_CHAR:
/* Display args */ /* Display args */
memcpy(output, extra, n); memcpy(output, extra, n);
break; break;
default: default:
DBG_8192C("%s: Not yet implemented...\n", __func__); DBG_8192C("%s: Not yet implemented...\n", __func__);
err = -1; err = -1;
goto exit; goto exit;
} }
output_len = strlen(output) + 1; output_len = strlen(output) + 1;
...@@ -5225,18 +5225,18 @@ int rtw_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) ...@@ -5225,18 +5225,18 @@ int rtw_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
int ret = 0; int ret = 0;
switch (cmd) { switch (cmd) {
case RTL_IOCTL_WPA_SUPPLICANT: case RTL_IOCTL_WPA_SUPPLICANT:
ret = wpa_supplicant_ioctl(dev, &wrq->u.data); ret = wpa_supplicant_ioctl(dev, &wrq->u.data);
break; break;
case RTL_IOCTL_HOSTAPD: case RTL_IOCTL_HOSTAPD:
ret = rtw_hostapd_ioctl(dev, &wrq->u.data); ret = rtw_hostapd_ioctl(dev, &wrq->u.data);
break; break;
case SIOCDEVPRIVATE: case SIOCDEVPRIVATE:
ret = rtw_ioctl_wext_private(dev, &wrq->u); ret = rtw_ioctl_wext_private(dev, &wrq->u);
break; break;
default: default:
ret = -EOPNOTSUPP; ret = -EOPNOTSUPP;
break; break;
} }
return ret; return ret;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7