Skip to content

L
linux
Commit 28cda5ae authored by Chaitanya Hazarey's avatar Chaitanya Hazarey Committed by Greg Kroah-Hartman
Browse files
Options

Staging: rtl8192u: r8192U_wx.c Added {} braces and newlines 

Added {} braces and newlines to address the following:

ERROR: else should follow close brace '}'
ERROR: space required before the open brace '{'
ERROR: trailing statements should be on next line
ERROR: space required before the open parenthesis '('
ERROR: that open brace { should be on the previous line
Signed-off-by: default avatarChaitanya Hazarey <c@24.io>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 654d1ce9
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 38 deletions
drivers/staging/rtl8192u/r8192U_wx.c
View file @ 28cda5ae
...@@ -315,7 +315,7 @@ static int rtl8180_wx_get_range(struct net_device *dev, ...@@ -315,7 +315,7 @@ static int rtl8180_wx_get_range(struct net_device *dev,
} }
if (val == IW_MAX_FREQUENCIES) if (val == IW_MAX_FREQUENCIES)
break; break;
} }
range->num_frequency = val; range->num_frequency = val;
range->num_channels = val; range->num_channels = val;
...@@ -333,15 +333,14 @@ static int r8192_wx_set_scan(struct net_device *dev, struct iw_request_info *a, ...@@ -333,15 +333,14 @@ static int r8192_wx_set_scan(struct net_device *dev, struct iw_request_info *a,
struct ieee80211_device *ieee = priv->ieee80211; struct ieee80211_device *ieee = priv->ieee80211;
int ret = 0; int ret = 0;
if (!priv->up) return -ENETDOWN; if (!priv->up)
return -ENETDOWN;
if (priv->ieee80211->LinkDetectInfo.bBusyTraffic == true) if (priv->ieee80211->LinkDetectInfo.bBusyTraffic == true)
return -EAGAIN; return -EAGAIN;
if (wrqu->data.flags & IW_SCAN_THIS_ESSID) if (wrqu->data.flags & IW_SCAN_THIS_ESSID) {
{
struct iw_scan_req *req = (struct iw_scan_req *)b; struct iw_scan_req *req = (struct iw_scan_req *)b;
if (req->essid_len) if (req->essid_len) {
{
//printk("==**&*&*&**===>scan set ssid:%s\n", req->essid); //printk("==**&*&*&**===>scan set ssid:%s\n", req->essid);
ieee->current_network.ssid_len = req->essid_len; ieee->current_network.ssid_len = req->essid_len;
memcpy(ieee->current_network.ssid, req->essid, req->essid_len); memcpy(ieee->current_network.ssid, req->essid, req->essid_len);
...@@ -354,9 +353,9 @@ static int r8192_wx_set_scan(struct net_device *dev, struct iw_request_info *a, ...@@ -354,9 +353,9 @@ static int r8192_wx_set_scan(struct net_device *dev, struct iw_request_info *a,
priv->ieee80211->scanning = 0; priv->ieee80211->scanning = 0;
ieee80211_softmac_scan_syncro(priv->ieee80211); ieee80211_softmac_scan_syncro(priv->ieee80211);
ret = 0; ret = 0;
} else {
ret = ieee80211_wx_set_scan(priv->ieee80211, a, wrqu, b);
} }
else
ret = ieee80211_wx_set_scan(priv->ieee80211, a, wrqu, b);
up(&priv->wx_sem); up(&priv->wx_sem);
return ret; return ret;
} }
...@@ -369,7 +368,8 @@ static int r8192_wx_get_scan(struct net_device *dev, struct iw_request_info *a, ...@@ -369,7 +368,8 @@ static int r8192_wx_get_scan(struct net_device *dev, struct iw_request_info *a,
int ret; int ret;
struct r8192_priv *priv = ieee80211_priv(dev); struct r8192_priv *priv = ieee80211_priv(dev);
if (!priv->up) return -ENETDOWN; if (!priv->up)
return -ENETDOWN;
down(&priv->wx_sem); down(&priv->wx_sem);
...@@ -530,7 +530,8 @@ static int r8192_wx_set_enc(struct net_device *dev, ...@@ -530,7 +530,8 @@ static int r8192_wx_set_enc(struct net_device *dev,
{0x00, 0x00, 0x00, 0x00, 0x00, 0x03} }; {0x00, 0x00, 0x00, 0x00, 0x00, 0x03} };
int i; int i;
if (!priv->up) return -ENETDOWN; if (!priv->up)
return -ENETDOWN;
down(&priv->wx_sem); down(&priv->wx_sem);
...@@ -546,8 +547,10 @@ static int r8192_wx_set_enc(struct net_device *dev, ...@@ -546,8 +547,10 @@ static int r8192_wx_set_enc(struct net_device *dev,
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
hwkey[i] |= key[4*i+0]&mask; hwkey[i] |= key[4*i+0]&mask;
if (i == 1 && (4*i+1) == wrqu->encoding.length) mask = 0x00; if (i == 1 && (4*i+1) == wrqu->encoding.length)
if (i == 3 && (4*i+1) == wrqu->encoding.length) mask = 0x00; mask = 0x00;
if (i == 3 && (4*i+1) == wrqu->encoding.length)
mask = 0x00;
hwkey[i] |= (key[4*i+1]&mask)<<8; hwkey[i] |= (key[4*i+1]&mask)<<8;
hwkey[i] |= (key[4*i+2]&mask)<<16; hwkey[i] |= (key[4*i+2]&mask)<<16;
hwkey[i] |= (key[4*i+3]&mask)<<24; hwkey[i] |= (key[4*i+3]&mask)<<24;
...@@ -557,12 +560,23 @@ static int r8192_wx_set_enc(struct net_device *dev, ...@@ -557,12 +560,23 @@ static int r8192_wx_set_enc(struct net_device *dev,
#define CONF_WEP104 0x14 #define CONF_WEP104 0x14
switch (wrqu->encoding.flags & IW_ENCODE_INDEX) { switch (wrqu->encoding.flags & IW_ENCODE_INDEX) {
case 0: key_idx = ieee->tx_keyidx; break; case 0:
case 1: key_idx = 0; break; key_idx = ieee->tx_keyidx;
case 2: key_idx = 1; break; break;
case 3: key_idx = 2; break; case 1:
case 4: key_idx = 3; break; key_idx = 0;
default: break; break;
case 2:
key_idx = 1;
break;
case 3:
key_idx = 2;
break;
case 4:
key_idx = 3;
break;
default:
break;
} }
if (wrqu->encoding.length == 0x5) { if (wrqu->encoding.length == 0x5) {
...@@ -591,8 +605,9 @@ static int r8192_wx_set_enc(struct net_device *dev, ...@@ -591,8 +605,9 @@ static int r8192_wx_set_enc(struct net_device *dev,
0, //DefaultKey 0, //DefaultKey
hwkey); //KeyContent hwkey); //KeyContent
} else {
printk("wrong type in WEP, not WEP40 and WEP104\n");
} }
else printk("wrong type in WEP, not WEP40 and WEP104\n");
} }
...@@ -600,8 +615,8 @@ static int r8192_wx_set_enc(struct net_device *dev, ...@@ -600,8 +615,8 @@ static int r8192_wx_set_enc(struct net_device *dev,
} }
static int r8192_wx_set_scan_type(struct net_device *dev, struct iw_request_info *aa, union static int r8192_wx_set_scan_type(struct net_device *dev, struct iw_request_info *aa,
iwreq_data *wrqu, char *p){ union iwreq_data *wrqu, char *p){
struct r8192_priv *priv = ieee80211_priv(dev); struct r8192_priv *priv = ieee80211_priv(dev);
int *parms = (int *)p; int *parms = (int *)p;
...@@ -751,18 +766,18 @@ static int r8192_wx_set_enc_ext(struct net_device *dev, ...@@ -751,18 +766,18 @@ static int r8192_wx_set_enc_ext(struct net_device *dev,
struct iw_encode_ext *ext = (struct iw_encode_ext *)extra; struct iw_encode_ext *ext = (struct iw_encode_ext *)extra;
struct iw_point *encoding = &wrqu->encoding; struct iw_point *encoding = &wrqu->encoding;
u8 idx = 0, alg = 0, group = 0; u8 idx = 0, alg = 0, group = 0;
if ((encoding->flags & IW_ENCODE_DISABLED) || if ((encoding->flags & IW_ENCODE_DISABLED) || ext->alg == IW_ENCODE_ALG_NONE)
ext->alg == IW_ENCODE_ALG_NONE) //none is not allowed to use hwsec WB 2008.07.01 //none is not allowed to use hwsec WB 2008.07.01
goto end_hw_sec; goto end_hw_sec;
alg = (ext->alg == IW_ENCODE_ALG_CCMP)?KEY_TYPE_CCMP:ext->alg; // as IW_ENCODE_ALG_CCMP is defined to be 3 and KEY_TYPE_CCMP is defined to 4; // as IW_ENCODE_ALG_CCMP is defined to be 3 and KEY_TYPE_CCMP is defined to 4;
alg = (ext->alg == IW_ENCODE_ALG_CCMP)?KEY_TYPE_CCMP:ext->alg;
idx = encoding->flags & IW_ENCODE_INDEX; idx = encoding->flags & IW_ENCODE_INDEX;
if (idx) if (idx)
idx--; idx--;
group = ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY; group = ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY;
if ((!group) || (IW_MODE_ADHOC == ieee->iw_mode) || (alg == KEY_TYPE_WEP40)) if ((!group) || (IW_MODE_ADHOC == ieee->iw_mode) || (alg == KEY_TYPE_WEP40)) {
{
if ((ext->key_len == 13) && (alg == KEY_TYPE_WEP40)) if ((ext->key_len == 13) && (alg == KEY_TYPE_WEP40))
alg = KEY_TYPE_WEP104; alg = KEY_TYPE_WEP104;
ieee->pairwise_key_type = alg; ieee->pairwise_key_type = alg;
...@@ -770,8 +785,7 @@ static int r8192_wx_set_enc_ext(struct net_device *dev, ...@@ -770,8 +785,7 @@ static int r8192_wx_set_enc_ext(struct net_device *dev,
} }
memcpy((u8 *)key, ext->key, 16); //we only get 16 bytes key.why? WB 2008.7.1 memcpy((u8 *)key, ext->key, 16); //we only get 16 bytes key.why? WB 2008.7.1
if ((alg & KEY_TYPE_WEP40) && (ieee->auth_mode != 2)) if ((alg & KEY_TYPE_WEP40) && (ieee->auth_mode != 2)) {
{
setKey(dev, setKey(dev,
idx,//EntryNo idx,//EntryNo
...@@ -780,9 +794,7 @@ static int r8192_wx_set_enc_ext(struct net_device *dev, ...@@ -780,9 +794,7 @@ static int r8192_wx_set_enc_ext(struct net_device *dev,
zero, //MacAddr zero, //MacAddr
0, //DefaultKey 0, //DefaultKey
key); //KeyContent key); //KeyContent
} } else if (group) {
else if (group)
{
ieee->group_key_type = alg; ieee->group_key_type = alg;
setKey(dev, setKey(dev,
idx,//EntryNo idx,//EntryNo
...@@ -791,9 +803,7 @@ static int r8192_wx_set_enc_ext(struct net_device *dev, ...@@ -791,9 +803,7 @@ static int r8192_wx_set_enc_ext(struct net_device *dev,
broadcast_addr, //MacAddr broadcast_addr, //MacAddr
0, //DefaultKey 0, //DefaultKey
key); //KeyContent key); //KeyContent
} } else {//pairwise key
else //pairwise key
{
setKey(dev, setKey(dev,
4,//EntryNo 4,//EntryNo
idx, //KeyIndex idx, //KeyIndex
...@@ -863,8 +873,7 @@ static int dummy(struct net_device *dev, struct iw_request_info *a, ...@@ -863,8 +873,7 @@ static int dummy(struct net_device *dev, struct iw_request_info *a,
} }
static iw_handler r8192_wx_handlers[] = static iw_handler r8192_wx_handlers[] = {
{
NULL, /* SIOCSIWCOMMIT */ NULL, /* SIOCSIWCOMMIT */
r8192_wx_get_name, /* SIOCGIWNAME */ r8192_wx_get_name, /* SIOCGIWNAME */
dummy, /* SIOCSIWNWID */ dummy, /* SIOCSIWNWID */
...@@ -971,8 +980,7 @@ struct iw_statistics *r8192_get_wireless_stats(struct net_device *dev) ...@@ -971,8 +980,7 @@ struct iw_statistics *r8192_get_wireless_stats(struct net_device *dev)
int tmp_level = 0; int tmp_level = 0;
int tmp_qual = 0; int tmp_qual = 0;
int tmp_noise = 0; int tmp_noise = 0;
if (ieee->state < IEEE80211_LINKED) if (ieee->state < IEEE80211_LINKED) {
{
wstats->qual.qual = 0; wstats->qual.qual = 0;
wstats->qual.level = 0; wstats->qual.level = 0;
wstats->qual.noise = 0; wstats->qual.noise = 0;
......
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