OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging/rtl8192u: use same indent for switch and case 

Fix the checkpatch error "switch and case should be at the same indent"

Signed-off-by: Sebastian Hahn <snsehahn@cip.cs.fau.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Sebastian Hahn 2012-12-05 21:40:22 +01:00 committed by Greg Kroah-Hartman
parent c4cda30469
commit 24fbe87525
7 changed files with 417 additions and 417 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

294
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
View File

@ -1948,166 +1948,166 @@ ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb,
switch (WLAN_FC_GET_STYPE(header->frame_ctl)) { switch (WLAN_FC_GET_STYPE(header->frame_ctl)) {
case IEEE80211_STYPE_ASSOC_RESP: case IEEE80211_STYPE_ASSOC_RESP:
case IEEE80211_STYPE_REASSOC_RESP: case IEEE80211_STYPE_REASSOC_RESP:
IEEE80211_DEBUG_MGMT("received [RE]ASSOCIATION RESPONSE (%d)\n", IEEE80211_DEBUG_MGMT("received [RE]ASSOCIATION RESPONSE (%d)\n",
WLAN_FC_GET_STYPE(header->frame_ctl)); WLAN_FC_GET_STYPE(header->frame_ctl));
if ((ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE) && if ((ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE) &&
ieee->state == IEEE80211_ASSOCIATING_AUTHENTICATED && ieee->state == IEEE80211_ASSOCIATING_AUTHENTICATED &&
ieee->iw_mode == IW_MODE_INFRA){ ieee->iw_mode == IW_MODE_INFRA){
struct ieee80211_network network_resp; struct ieee80211_network network_resp;
struct ieee80211_network *network = &network_resp; struct ieee80211_network *network = &network_resp;
if (0 == (errcode=assoc_parse(ieee,skb, &aid))){ if (0 == (errcode=assoc_parse(ieee,skb, &aid))){
ieee->state=IEEE80211_LINKED; ieee->state=IEEE80211_LINKED;
ieee->assoc_id = aid; ieee->assoc_id = aid;
ieee->softmac_stats.rx_ass_ok++; ieee->softmac_stats.rx_ass_ok++;
/* station support qos */ /* station support qos */
/* Let the register setting defaultly with Legacy station */ /* Let the register setting defaultly with Legacy station */
if(ieee->qos_support) { if(ieee->qos_support) {
assoc_resp = (struct ieee80211_assoc_response_frame*)skb->data; assoc_resp = (struct ieee80211_assoc_response_frame*)skb->data;
memset(network, 0, sizeof(*network)); memset(network, 0, sizeof(*network));
if (ieee80211_parse_info_param(ieee,assoc_resp->info_element,\ if (ieee80211_parse_info_param(ieee,assoc_resp->info_element,\
rx_stats->len - sizeof(*assoc_resp),\ rx_stats->len - sizeof(*assoc_resp),\
network,rx_stats)){ network,rx_stats)){
return 1; return 1;
}
else
{ //filling the PeerHTCap. //maybe not necessary as we can get its info from current_network.
memcpy(ieee->pHTInfo->PeerHTCapBuf, network->bssht.bdHTCapBuf, network->bssht.bdHTCapLen);
memcpy(ieee->pHTInfo->PeerHTInfoBuf, network->bssht.bdHTInfoBuf, network->bssht.bdHTInfoLen);
}
if (ieee->handle_assoc_response != NULL)
ieee->handle_assoc_response(ieee->dev, (struct ieee80211_assoc_response_frame*)header, network);
} }
ieee80211_associate_complete(ieee); else
{ //filling the PeerHTCap. //maybe not necessary as we can get its info from current_network.
memcpy(ieee->pHTInfo->PeerHTCapBuf, network->bssht.bdHTCapBuf, network->bssht.bdHTCapLen);
memcpy(ieee->pHTInfo->PeerHTInfoBuf, network->bssht.bdHTInfoBuf, network->bssht.bdHTInfoLen);
}
if (ieee->handle_assoc_response != NULL)
ieee->handle_assoc_response(ieee->dev, (struct ieee80211_assoc_response_frame*)header, network);
}
ieee80211_associate_complete(ieee);
} else {
/* aid could not been allocated */
ieee->softmac_stats.rx_ass_err++;
printk(
"Association response status code 0x%x\n",
errcode);
IEEE80211_DEBUG_MGMT(
"Association response status code 0x%x\n",
errcode);
if(ieee->AsocRetryCount < RT_ASOC_RETRY_LIMIT) {
queue_work(ieee->wq, &ieee->associate_procedure_wq);
} else { } else {
/* aid could not been allocated */ ieee80211_associate_abort(ieee);
ieee->softmac_stats.rx_ass_err++; }
printk( }
"Association response status code 0x%x\n", }
errcode); break;
IEEE80211_DEBUG_MGMT(
"Association response status code 0x%x\n", case IEEE80211_STYPE_ASSOC_REQ:
errcode); case IEEE80211_STYPE_REASSOC_REQ:
if(ieee->AsocRetryCount < RT_ASOC_RETRY_LIMIT) {
queue_work(ieee->wq, &ieee->associate_procedure_wq); if ((ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE) &&
} else { ieee->iw_mode == IW_MODE_MASTER)
ieee80211_rx_assoc_rq(ieee, skb);
break;
case IEEE80211_STYPE_AUTH:
if (ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE){
if (ieee->state == IEEE80211_ASSOCIATING_AUTHENTICATING &&
ieee->iw_mode == IW_MODE_INFRA){
IEEE80211_DEBUG_MGMT("Received authentication response");
if (0 == (errcode=auth_parse(skb, &challenge, &chlen))){
if(ieee->open_wep || !challenge){
ieee->state = IEEE80211_ASSOCIATING_AUTHENTICATED;
ieee->softmac_stats.rx_auth_rs_ok++;
if(!(ieee->pHTInfo->IOTAction&HT_IOT_ACT_PURE_N_MODE))
{
if (!ieee->GetNmodeSupportBySecCfg(ieee->dev))
{
// WEP or TKIP encryption
if(IsHTHalfNmodeAPs(ieee))
{
bSupportNmode = true;
bHalfSupportNmode = true;
}
else
{
bSupportNmode = false;
bHalfSupportNmode = false;
}
printk("==========>to link with AP using SEC(%d, %d)", bSupportNmode, bHalfSupportNmode);
}
}
/* Dummy wirless mode setting to avoid encryption issue */
if(bSupportNmode) {
//N mode setting
ieee->SetWirelessMode(ieee->dev, \
ieee->current_network.mode);
}else{
//b/g mode setting
/*TODO*/
ieee->SetWirelessMode(ieee->dev, IEEE_G);
}
if (ieee->current_network.mode == IEEE_N_24G && bHalfSupportNmode == true)
{
printk("===============>entern half N mode\n");
ieee->bHalfWirelessN24GMode = true;
}
else
ieee->bHalfWirelessN24GMode = false;
ieee80211_associate_step2(ieee);
}else{
ieee80211_auth_challenge(ieee, challenge, chlen);
}
}else{
ieee->softmac_stats.rx_auth_rs_err++;
IEEE80211_DEBUG_MGMT("Authentication response status code 0x%x",errcode);
ieee80211_associate_abort(ieee); ieee80211_associate_abort(ieee);
} }
}else if (ieee->iw_mode == IW_MODE_MASTER){
ieee80211_rx_auth_rq(ieee, skb);
} }
} }
break; break;
case IEEE80211_STYPE_ASSOC_REQ: case IEEE80211_STYPE_PROBE_REQ:
case IEEE80211_STYPE_REASSOC_REQ:
if ((ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE) && if ((ieee->softmac_features & IEEE_SOFTMAC_PROBERS) &&
ieee->iw_mode == IW_MODE_MASTER) ((ieee->iw_mode == IW_MODE_ADHOC ||
ieee->iw_mode == IW_MODE_MASTER) &&
ieee->state == IEEE80211_LINKED)){
ieee80211_rx_probe_rq(ieee, skb);
}
break;
ieee80211_rx_assoc_rq(ieee, skb); case IEEE80211_STYPE_DISASSOC:
break; case IEEE80211_STYPE_DEAUTH:
/* FIXME for now repeat all the association procedure
* both for disassociation and deauthentication
*/
if ((ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE) &&
ieee->state == IEEE80211_LINKED &&
ieee->iw_mode == IW_MODE_INFRA){
case IEEE80211_STYPE_AUTH: ieee->state = IEEE80211_ASSOCIATING;
ieee->softmac_stats.reassoc++;
if (ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE){ notify_wx_assoc_event(ieee);
if (ieee->state == IEEE80211_ASSOCIATING_AUTHENTICATING && //HTSetConnectBwMode(ieee, HT_CHANNEL_WIDTH_20, HT_EXTCHNL_OFFSET_NO_EXT);
ieee->iw_mode == IW_MODE_INFRA){ RemovePeerTS(ieee, header->addr2);
queue_work(ieee->wq, &ieee->associate_procedure_wq);
IEEE80211_DEBUG_MGMT("Received authentication response"); }
break;
if (0 == (errcode=auth_parse(skb, &challenge, &chlen))){ case IEEE80211_STYPE_MANAGE_ACT:
if(ieee->open_wep || !challenge){ ieee80211_process_action(ieee,skb);
ieee->state = IEEE80211_ASSOCIATING_AUTHENTICATED; break;
ieee->softmac_stats.rx_auth_rs_ok++; default:
if(!(ieee->pHTInfo->IOTAction&HT_IOT_ACT_PURE_N_MODE)) return -1;
{ break;
if (!ieee->GetNmodeSupportBySecCfg(ieee->dev))
{
// WEP or TKIP encryption
if(IsHTHalfNmodeAPs(ieee))
{
bSupportNmode = true;
bHalfSupportNmode = true;
}
else
{
bSupportNmode = false;
bHalfSupportNmode = false;
}
printk("==========>to link with AP using SEC(%d, %d)", bSupportNmode, bHalfSupportNmode);
}
}
/* Dummy wirless mode setting to avoid encryption issue */
if(bSupportNmode) {
//N mode setting
ieee->SetWirelessMode(ieee->dev, \
ieee->current_network.mode);
}else{
//b/g mode setting
/*TODO*/
ieee->SetWirelessMode(ieee->dev, IEEE_G);
}
if (ieee->current_network.mode == IEEE_N_24G && bHalfSupportNmode == true)
{
printk("===============>entern half N mode\n");
ieee->bHalfWirelessN24GMode = true;
}
else
ieee->bHalfWirelessN24GMode = false;
ieee80211_associate_step2(ieee);
}else{
ieee80211_auth_challenge(ieee, challenge, chlen);
}
}else{
ieee->softmac_stats.rx_auth_rs_err++;
IEEE80211_DEBUG_MGMT("Authentication response status code 0x%x",errcode);
ieee80211_associate_abort(ieee);
}
}else if (ieee->iw_mode == IW_MODE_MASTER){
ieee80211_rx_auth_rq(ieee, skb);
}
}
break;
case IEEE80211_STYPE_PROBE_REQ:
if ((ieee->softmac_features & IEEE_SOFTMAC_PROBERS) &&
((ieee->iw_mode == IW_MODE_ADHOC ||
ieee->iw_mode == IW_MODE_MASTER) &&
ieee->state == IEEE80211_LINKED)){
ieee80211_rx_probe_rq(ieee, skb);
}
break;
case IEEE80211_STYPE_DISASSOC:
case IEEE80211_STYPE_DEAUTH:
/* FIXME for now repeat all the association procedure
* both for disassociation and deauthentication
*/
if ((ieee->softmac_features & IEEE_SOFTMAC_ASSOCIATE) &&
ieee->state == IEEE80211_LINKED &&
ieee->iw_mode == IW_MODE_INFRA){
ieee->state = IEEE80211_ASSOCIATING;
ieee->softmac_stats.reassoc++;
notify_wx_assoc_event(ieee);
//HTSetConnectBwMode(ieee, HT_CHANNEL_WIDTH_20, HT_EXTCHNL_OFFSET_NO_EXT);
RemovePeerTS(ieee, header->addr2);
queue_work(ieee->wq, &ieee->associate_procedure_wq);
}
break;
case IEEE80211_STYPE_MANAGE_ACT:
ieee80211_process_action(ieee,skb);
break;
default:
return -1;
break;
} }
//dev_kfree_skb_any(skb); //dev_kfree_skb_any(skb);

32
drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c
View File

@ -283,22 +283,22 @@ ieee80211_classify(struct sk_buff *skb, struct ieee80211_network *network)
// IEEE80211_DEBUG_DATA(IEEE80211_DL_DATA, skb->data, skb->len); // IEEE80211_DEBUG_DATA(IEEE80211_DL_DATA, skb->data, skb->len);
ip = ip_hdr(skb); ip = ip_hdr(skb);
switch (ip->tos & 0xfc) { switch (ip->tos & 0xfc) {
case 0x20: case 0x20:
return 2; return 2;
case 0x40: case 0x40:
return 1; return 1;
case 0x60: case 0x60:
return 3; return 3;
case 0x80: case 0x80:
return 4; return 4;
case 0xa0: case 0xa0:
return 5; return 5;
case 0xc0: case 0xc0:
return 6; return 6;
case 0xe0: case 0xe0:
return 7; return 7;
default: default:
return 0; return 0;
} }
} }

2
drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c
View File

@ -761,7 +761,7 @@ int ieee80211_wx_set_mlme(struct ieee80211_device *ieee,
case IW_MLME_DISASSOC: case IW_MLME_DISASSOC:
ieee80211_disassociate(ieee); ieee80211_disassociate(ieee);
break; break;
default: default:
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
return 0; return 0;

332
drivers/staging/rtl8192u/r8192U_core.c
View File

@ -1875,43 +1875,43 @@ u8 MapHwQueueToFirmwareQueue(u8 QueueID)
u8 QueueSelect = 0x0; //defualt set to u8 QueueSelect = 0x0; //defualt set to
switch(QueueID) { switch(QueueID) {
case BE_QUEUE: case BE_QUEUE:
QueueSelect = QSLT_BE; //or QSelect = pTcb->priority; QueueSelect = QSLT_BE; //or QSelect = pTcb->priority;
break; break;
case BK_QUEUE: case BK_QUEUE:
QueueSelect = QSLT_BK; //or QSelect = pTcb->priority; QueueSelect = QSLT_BK; //or QSelect = pTcb->priority;
break; break;
case VO_QUEUE: case VO_QUEUE:
QueueSelect = QSLT_VO; //or QSelect = pTcb->priority; QueueSelect = QSLT_VO; //or QSelect = pTcb->priority;
break; break;
case VI_QUEUE: case VI_QUEUE:
QueueSelect = QSLT_VI; //or QSelect = pTcb->priority; QueueSelect = QSLT_VI; //or QSelect = pTcb->priority;
break; break;
case MGNT_QUEUE: case MGNT_QUEUE:
QueueSelect = QSLT_MGNT; QueueSelect = QSLT_MGNT;
break; break;
case BEACON_QUEUE: case BEACON_QUEUE:
QueueSelect = QSLT_BEACON; QueueSelect = QSLT_BEACON;
break; break;
// TODO: 2006.10.30 mark other queue selection until we verify it is OK // TODO: 2006.10.30 mark other queue selection until we verify it is OK
// TODO: Remove Assertions // TODO: Remove Assertions
//#if (RTL819X_FPGA_VER & RTL819X_FPGA_GUANGAN_070502) //#if (RTL819X_FPGA_VER & RTL819X_FPGA_GUANGAN_070502)
case TXCMD_QUEUE: case TXCMD_QUEUE:
QueueSelect = QSLT_CMD; QueueSelect = QSLT_CMD;
break; break;
//#endif //#endif
case HIGH_QUEUE: case HIGH_QUEUE:
QueueSelect = QSLT_HIGH; QueueSelect = QSLT_HIGH;
break; break;
default: default:
RT_TRACE(COMP_ERR, "TransmitTCB(): Impossible Queue Selection: %d \n", QueueID); RT_TRACE(COMP_ERR, "TransmitTCB(): Impossible Queue Selection: %d \n", QueueID);
break; break;
} }
return QueueSelect; return QueueSelect;
} }
@ -1921,39 +1921,39 @@ u8 MRateToHwRate8190Pci(u8 rate)
u8 ret = DESC90_RATE1M; u8 ret = DESC90_RATE1M;
switch(rate) { switch(rate) {
case MGN_1M: ret = DESC90_RATE1M; break; case MGN_1M: ret = DESC90_RATE1M; break;
case MGN_2M: ret = DESC90_RATE2M; break; case MGN_2M: ret = DESC90_RATE2M; break;
case MGN_5_5M: ret = DESC90_RATE5_5M; break; case MGN_5_5M: ret = DESC90_RATE5_5M; break;
case MGN_11M: ret = DESC90_RATE11M; break; case MGN_11M: ret = DESC90_RATE11M; break;
case MGN_6M: ret = DESC90_RATE6M; break; case MGN_6M: ret = DESC90_RATE6M; break;
case MGN_9M: ret = DESC90_RATE9M; break; case MGN_9M: ret = DESC90_RATE9M; break;
case MGN_12M: ret = DESC90_RATE12M; break; case MGN_12M: ret = DESC90_RATE12M; break;
case MGN_18M: ret = DESC90_RATE18M; break; case MGN_18M: ret = DESC90_RATE18M; break;
case MGN_24M: ret = DESC90_RATE24M; break; case MGN_24M: ret = DESC90_RATE24M; break;
case MGN_36M: ret = DESC90_RATE36M; break; case MGN_36M: ret = DESC90_RATE36M; break;
case MGN_48M: ret = DESC90_RATE48M; break; case MGN_48M: ret = DESC90_RATE48M; break;
case MGN_54M: ret = DESC90_RATE54M; break; case MGN_54M: ret = DESC90_RATE54M; break;
// HT rate since here // HT rate since here
case MGN_MCS0: ret = DESC90_RATEMCS0; break; case MGN_MCS0: ret = DESC90_RATEMCS0; break;
case MGN_MCS1: ret = DESC90_RATEMCS1; break; case MGN_MCS1: ret = DESC90_RATEMCS1; break;
case MGN_MCS2: ret = DESC90_RATEMCS2; break; case MGN_MCS2: ret = DESC90_RATEMCS2; break;
case MGN_MCS3: ret = DESC90_RATEMCS3; break; case MGN_MCS3: ret = DESC90_RATEMCS3; break;
case MGN_MCS4: ret = DESC90_RATEMCS4; break; case MGN_MCS4: ret = DESC90_RATEMCS4; break;
case MGN_MCS5: ret = DESC90_RATEMCS5; break; case MGN_MCS5: ret = DESC90_RATEMCS5; break;
case MGN_MCS6: ret = DESC90_RATEMCS6; break; case MGN_MCS6: ret = DESC90_RATEMCS6; break;
case MGN_MCS7: ret = DESC90_RATEMCS7; break; case MGN_MCS7: ret = DESC90_RATEMCS7; break;
case MGN_MCS8: ret = DESC90_RATEMCS8; break; case MGN_MCS8: ret = DESC90_RATEMCS8; break;
case MGN_MCS9: ret = DESC90_RATEMCS9; break; case MGN_MCS9: ret = DESC90_RATEMCS9; break;
case MGN_MCS10: ret = DESC90_RATEMCS10; break; case MGN_MCS10: ret = DESC90_RATEMCS10; break;
case MGN_MCS11: ret = DESC90_RATEMCS11; break; case MGN_MCS11: ret = DESC90_RATEMCS11; break;
case MGN_MCS12: ret = DESC90_RATEMCS12; break; case MGN_MCS12: ret = DESC90_RATEMCS12; break;
case MGN_MCS13: ret = DESC90_RATEMCS13; break; case MGN_MCS13: ret = DESC90_RATEMCS13; break;
case MGN_MCS14: ret = DESC90_RATEMCS14; break; case MGN_MCS14: ret = DESC90_RATEMCS14; break;
case MGN_MCS15: ret = DESC90_RATEMCS15; break; case MGN_MCS15: ret = DESC90_RATEMCS15; break;
case (0x80|0x20): ret = DESC90_RATEMCS32; break; case (0x80|0x20): ret = DESC90_RATEMCS32; break;
default: break; default: break;
} }
return ret; return ret;
} }
@ -4364,66 +4364,66 @@ int rtl8192_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
} }
switch (cmd) { switch (cmd) {
case RTL_IOCTL_WPA_SUPPLICANT: case RTL_IOCTL_WPA_SUPPLICANT:
//parse here for HW security //parse here for HW security
if (ipw->cmd == IEEE_CMD_SET_ENCRYPTION) if (ipw->cmd == IEEE_CMD_SET_ENCRYPTION)
{
if (ipw->u.crypt.set_tx)
{ {
if (ipw->u.crypt.set_tx) if (strcmp(ipw->u.crypt.alg, "CCMP") == 0)
ieee->pairwise_key_type = KEY_TYPE_CCMP;
else if (strcmp(ipw->u.crypt.alg, "TKIP") == 0)
ieee->pairwise_key_type = KEY_TYPE_TKIP;
else if (strcmp(ipw->u.crypt.alg, "WEP") == 0)
{ {
if (strcmp(ipw->u.crypt.alg, "CCMP") == 0) if (ipw->u.crypt.key_len == 13)
ieee->pairwise_key_type = KEY_TYPE_CCMP; ieee->pairwise_key_type = KEY_TYPE_WEP104;
else if (strcmp(ipw->u.crypt.alg, "TKIP") == 0) else if (ipw->u.crypt.key_len == 5)
ieee->pairwise_key_type = KEY_TYPE_TKIP; ieee->pairwise_key_type = KEY_TYPE_WEP40;
else if (strcmp(ipw->u.crypt.alg, "WEP") == 0)
{
if (ipw->u.crypt.key_len == 13)
ieee->pairwise_key_type = KEY_TYPE_WEP104;
else if (ipw->u.crypt.key_len == 5)
ieee->pairwise_key_type = KEY_TYPE_WEP40;
}
else
ieee->pairwise_key_type = KEY_TYPE_NA;
if (ieee->pairwise_key_type)
{
memcpy((u8*)key, ipw->u.crypt.key, 16);
EnableHWSecurityConfig8192(dev);
//we fill both index entry and 4th entry for pairwise key as in IPW interface, adhoc will only get here, so we need index entry for its default key serching!
//added by WB.
setKey(dev, 4, ipw->u.crypt.idx, ieee->pairwise_key_type, (u8*)ieee->ap_mac_addr, 0, key);
if (ieee->auth_mode != 2)
setKey(dev, ipw->u.crypt.idx, ipw->u.crypt.idx, ieee->pairwise_key_type, (u8*)ieee->ap_mac_addr, 0, key);
}
} }
else //if (ipw->u.crypt.idx) //group key use idx > 0 else
ieee->pairwise_key_type = KEY_TYPE_NA;
if (ieee->pairwise_key_type)
{ {
memcpy((u8*)key, ipw->u.crypt.key, 16); memcpy((u8*)key, ipw->u.crypt.key, 16);
if (strcmp(ipw->u.crypt.alg, "CCMP") == 0) EnableHWSecurityConfig8192(dev);
ieee->group_key_type= KEY_TYPE_CCMP; //we fill both index entry and 4th entry for pairwise key as in IPW interface, adhoc will only get here, so we need index entry for its default key serching!
else if (strcmp(ipw->u.crypt.alg, "TKIP") == 0) //added by WB.
ieee->group_key_type = KEY_TYPE_TKIP; setKey(dev, 4, ipw->u.crypt.idx, ieee->pairwise_key_type, (u8*)ieee->ap_mac_addr, 0, key);
else if (strcmp(ipw->u.crypt.alg, "WEP") == 0) if (ieee->auth_mode != 2)
{ setKey(dev, ipw->u.crypt.idx, ipw->u.crypt.idx, ieee->pairwise_key_type, (u8*)ieee->ap_mac_addr, 0, key);
if (ipw->u.crypt.key_len == 13)
ieee->group_key_type = KEY_TYPE_WEP104;
else if (ipw->u.crypt.key_len == 5)
ieee->group_key_type = KEY_TYPE_WEP40;
}
else
ieee->group_key_type = KEY_TYPE_NA;
if (ieee->group_key_type)
{
setKey( dev,
ipw->u.crypt.idx,
ipw->u.crypt.idx, //KeyIndex
ieee->group_key_type, //KeyType
broadcast_addr, //MacAddr
0, //DefaultKey
key); //KeyContent
}
} }
} }
else //if (ipw->u.crypt.idx) //group key use idx > 0
{
memcpy((u8*)key, ipw->u.crypt.key, 16);
if (strcmp(ipw->u.crypt.alg, "CCMP") == 0)
ieee->group_key_type= KEY_TYPE_CCMP;
else if (strcmp(ipw->u.crypt.alg, "TKIP") == 0)
ieee->group_key_type = KEY_TYPE_TKIP;
else if (strcmp(ipw->u.crypt.alg, "WEP") == 0)
{
if (ipw->u.crypt.key_len == 13)
ieee->group_key_type = KEY_TYPE_WEP104;
else if (ipw->u.crypt.key_len == 5)
ieee->group_key_type = KEY_TYPE_WEP40;
}
else
ieee->group_key_type = KEY_TYPE_NA;
if (ieee->group_key_type)
{
setKey( dev,
ipw->u.crypt.idx,
ipw->u.crypt.idx, //KeyIndex
ieee->group_key_type, //KeyType
broadcast_addr, //MacAddr
0, //DefaultKey
key); //KeyContent
}
}
}
#ifdef JOHN_HWSEC_DEBUG #ifdef JOHN_HWSEC_DEBUG
//john's test 0711 //john's test 0711
printk("@@ wrq->u pointer = "); printk("@@ wrq->u pointer = ");
@ -4436,7 +4436,7 @@ int rtl8192_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
ret = ieee80211_wpa_supplicant_ioctl(priv->ieee80211, &wrq->u.data); ret = ieee80211_wpa_supplicant_ioctl(priv->ieee80211, &wrq->u.data);
break; break;
default: default:
ret = -EOPNOTSUPP; ret = -EOPNOTSUPP;
break; break;
} }
@ -4453,49 +4453,49 @@ u8 HwRateToMRate90(bool bIsHT, u8 rate)
if(!bIsHT) { if(!bIsHT) {
switch(rate) { switch(rate) {
case DESC90_RATE1M: ret_rate = MGN_1M; break; case DESC90_RATE1M: ret_rate = MGN_1M; break;
case DESC90_RATE2M: ret_rate = MGN_2M; break; case DESC90_RATE2M: ret_rate = MGN_2M; break;
case DESC90_RATE5_5M: ret_rate = MGN_5_5M; break; case DESC90_RATE5_5M: ret_rate = MGN_5_5M; break;
case DESC90_RATE11M: ret_rate = MGN_11M; break; case DESC90_RATE11M: ret_rate = MGN_11M; break;
case DESC90_RATE6M: ret_rate = MGN_6M; break; case DESC90_RATE6M: ret_rate = MGN_6M; break;
case DESC90_RATE9M: ret_rate = MGN_9M; break; case DESC90_RATE9M: ret_rate = MGN_9M; break;
case DESC90_RATE12M: ret_rate = MGN_12M; break; case DESC90_RATE12M: ret_rate = MGN_12M; break;
case DESC90_RATE18M: ret_rate = MGN_18M; break; case DESC90_RATE18M: ret_rate = MGN_18M; break;
case DESC90_RATE24M: ret_rate = MGN_24M; break; case DESC90_RATE24M: ret_rate = MGN_24M; break;
case DESC90_RATE36M: ret_rate = MGN_36M; break; case DESC90_RATE36M: ret_rate = MGN_36M; break;
case DESC90_RATE48M: ret_rate = MGN_48M; break; case DESC90_RATE48M: ret_rate = MGN_48M; break;
case DESC90_RATE54M: ret_rate = MGN_54M; break; case DESC90_RATE54M: ret_rate = MGN_54M; break;
default: default:
ret_rate = 0xff; ret_rate = 0xff;
RT_TRACE(COMP_RECV, "HwRateToMRate90(): Non supported Rate [%x], bIsHT = %d!!!\n", rate, bIsHT); RT_TRACE(COMP_RECV, "HwRateToMRate90(): Non supported Rate [%x], bIsHT = %d!!!\n", rate, bIsHT);
break; break;
} }
} else { } else {
switch(rate) { switch(rate) {
case DESC90_RATEMCS0: ret_rate = MGN_MCS0; break; case DESC90_RATEMCS0: ret_rate = MGN_MCS0; break;
case DESC90_RATEMCS1: ret_rate = MGN_MCS1; break; case DESC90_RATEMCS1: ret_rate = MGN_MCS1; break;
case DESC90_RATEMCS2: ret_rate = MGN_MCS2; break; case DESC90_RATEMCS2: ret_rate = MGN_MCS2; break;
case DESC90_RATEMCS3: ret_rate = MGN_MCS3; break; case DESC90_RATEMCS3: ret_rate = MGN_MCS3; break;
case DESC90_RATEMCS4: ret_rate = MGN_MCS4; break; case DESC90_RATEMCS4: ret_rate = MGN_MCS4; break;
case DESC90_RATEMCS5: ret_rate = MGN_MCS5; break; case DESC90_RATEMCS5: ret_rate = MGN_MCS5; break;
case DESC90_RATEMCS6: ret_rate = MGN_MCS6; break; case DESC90_RATEMCS6: ret_rate = MGN_MCS6; break;
case DESC90_RATEMCS7: ret_rate = MGN_MCS7; break; case DESC90_RATEMCS7: ret_rate = MGN_MCS7; break;
case DESC90_RATEMCS8: ret_rate = MGN_MCS8; break; case DESC90_RATEMCS8: ret_rate = MGN_MCS8; break;
case DESC90_RATEMCS9: ret_rate = MGN_MCS9; break; case DESC90_RATEMCS9: ret_rate = MGN_MCS9; break;
case DESC90_RATEMCS10: ret_rate = MGN_MCS10; break; case DESC90_RATEMCS10: ret_rate = MGN_MCS10; break;
case DESC90_RATEMCS11: ret_rate = MGN_MCS11; break; case DESC90_RATEMCS11: ret_rate = MGN_MCS11; break;
case DESC90_RATEMCS12: ret_rate = MGN_MCS12; break; case DESC90_RATEMCS12: ret_rate = MGN_MCS12; break;
case DESC90_RATEMCS13: ret_rate = MGN_MCS13; break; case DESC90_RATEMCS13: ret_rate = MGN_MCS13; break;
case DESC90_RATEMCS14: ret_rate = MGN_MCS14; break; case DESC90_RATEMCS14: ret_rate = MGN_MCS14; break;
case DESC90_RATEMCS15: ret_rate = MGN_MCS15; break; case DESC90_RATEMCS15: ret_rate = MGN_MCS15; break;
case DESC90_RATEMCS32: ret_rate = (0x80|0x20); break; case DESC90_RATEMCS32: ret_rate = (0x80|0x20); break;
default: default:
ret_rate = 0xff; ret_rate = 0xff;
RT_TRACE(COMP_RECV, "HwRateToMRate90(): Non supported Rate [%x], bIsHT = %d!!!\n",rate, bIsHT); RT_TRACE(COMP_RECV, "HwRateToMRate90(): Non supported Rate [%x], bIsHT = %d!!!\n",rate, bIsHT);
break; break;
} }
} }
@ -5696,25 +5696,25 @@ void rtl8192_irq_rx_tasklet(struct r8192_priv *priv)
info = (struct rtl8192_rx_info *)skb->cb; info = (struct rtl8192_rx_info *)skb->cb;
switch (info->out_pipe) { switch (info->out_pipe) {
/* Nomal packet pipe */ /* Nomal packet pipe */
case 3: case 3:
//RT_TRACE(COMP_RECV, "normal in-pipe index(%d)\n",info->out_pipe); //RT_TRACE(COMP_RECV, "normal in-pipe index(%d)\n",info->out_pipe);
priv->IrpPendingCount--; priv->IrpPendingCount--;
rtl8192_rx_nomal(skb); rtl8192_rx_nomal(skb);
break; break;
/* Command packet pipe */ /* Command packet pipe */
case 9: case 9:
RT_TRACE(COMP_RECV, "command in-pipe index(%d)\n",\ RT_TRACE(COMP_RECV, "command in-pipe index(%d)\n",\
info->out_pipe); info->out_pipe);
rtl8192_rx_cmd(skb); rtl8192_rx_cmd(skb);
break; break;
default: /* should never get here! */ default: /* should never get here! */
RT_TRACE(COMP_ERR, "Unknown in-pipe index(%d)\n",\ RT_TRACE(COMP_ERR, "Unknown in-pipe index(%d)\n",\
info->out_pipe); info->out_pipe);
dev_kfree_skb(skb); dev_kfree_skb(skb);
break; break;
} }
} }

12
drivers/staging/rtl8192u/r8192U_wx.c
View File

@ -710,12 +710,12 @@ 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: key_idx = ieee->tx_keyidx; break;
case 1: key_idx = 0; break; case 1: key_idx = 0; break;
case 2: key_idx = 1; break; case 2: key_idx = 1; break;
case 3: key_idx = 2; break; case 3: key_idx = 2; break;
case 4: key_idx = 3; break; case 4: key_idx = 3; break;
default: break; default: break;
} }
if(wrqu->encoding.length==0x5){ if(wrqu->encoding.length==0x5){

84
drivers/staging/rtl8192u/r819xU_firmware.c
View File

@ -334,56 +334,56 @@ bool init_firmware(struct net_device *dev)
} }
switch(init_step) { switch(init_step) {
case FW_INIT_STEP0_BOOT: case FW_INIT_STEP0_BOOT:
/* Download boot /* Download boot
* initialize command descriptor. * initialize command descriptor.
* will set polling bit when firmware code is also configured * will set polling bit when firmware code is also configured
*/ */
pfirmware->firmware_status = FW_STATUS_1_MOVE_BOOT_CODE; pfirmware->firmware_status = FW_STATUS_1_MOVE_BOOT_CODE;
#ifdef RTL8190P #ifdef RTL8190P
// To initialize IMEM, CPU move code from 0x80000080, hence, we send 0x80 byte packet // To initialize IMEM, CPU move code from 0x80000080, hence, we send 0x80 byte packet
rt_status = fwSendNullPacket(dev, RTL8190_CPU_START_OFFSET); rt_status = fwSendNullPacket(dev, RTL8190_CPU_START_OFFSET);
if(rt_status != true) if(rt_status != true)
{ {
RT_TRACE(COMP_INIT, "fwSendNullPacket() fail ! \n"); RT_TRACE(COMP_INIT, "fwSendNullPacket() fail ! \n");
goto download_firmware_fail; goto download_firmware_fail;
} }
#endif #endif
//mdelay(1000); //mdelay(1000);
/* /*
* To initialize IMEM, CPU move code from 0x80000080, * To initialize IMEM, CPU move code from 0x80000080,
* hence, we send 0x80 byte packet * hence, we send 0x80 byte packet
*/ */
break; break;
case FW_INIT_STEP1_MAIN: case FW_INIT_STEP1_MAIN:
/* Download firmware code. Wait until Boot Ready and Turn on CPU */ /* Download firmware code. Wait until Boot Ready and Turn on CPU */
pfirmware->firmware_status = FW_STATUS_2_MOVE_MAIN_CODE; pfirmware->firmware_status = FW_STATUS_2_MOVE_MAIN_CODE;
/* Check Put Code OK and Turn On CPU */ /* Check Put Code OK and Turn On CPU */
rt_status = CPUcheck_maincodeok_turnonCPU(dev); rt_status = CPUcheck_maincodeok_turnonCPU(dev);
if(rt_status != TRUE) { if(rt_status != TRUE) {
RT_TRACE(COMP_ERR, "CPUcheck_maincodeok_turnonCPU fail!\n"); RT_TRACE(COMP_ERR, "CPUcheck_maincodeok_turnonCPU fail!\n");
goto download_firmware_fail; goto download_firmware_fail;
} }
pfirmware->firmware_status = FW_STATUS_3_TURNON_CPU; pfirmware->firmware_status = FW_STATUS_3_TURNON_CPU;
break; break;
case FW_INIT_STEP2_DATA: case FW_INIT_STEP2_DATA:
/* download initial data code */ /* download initial data code */
pfirmware->firmware_status = FW_STATUS_4_MOVE_DATA_CODE; pfirmware->firmware_status = FW_STATUS_4_MOVE_DATA_CODE;
mdelay(1); mdelay(1);
rt_status = CPUcheck_firmware_ready(dev); rt_status = CPUcheck_firmware_ready(dev);
if(rt_status != TRUE) { if(rt_status != TRUE) {
RT_TRACE(COMP_ERR, "CPUcheck_firmware_ready fail(%d)!\n",rt_status); RT_TRACE(COMP_ERR, "CPUcheck_firmware_ready fail(%d)!\n",rt_status);
goto download_firmware_fail; goto download_firmware_fail;
} }
/* wait until data code is initialized ready.*/ /* wait until data code is initialized ready.*/
pfirmware->firmware_status = FW_STATUS_5_READY; pfirmware->firmware_status = FW_STATUS_5_READY;
break; break;
} }
} }

78
drivers/staging/rtl8192u/r819xU_phy.c
View File

@ -957,56 +957,56 @@ u8 rtl8192_phy_ConfigRFWithHeaderFile(struct net_device* dev, RF90_RADIO_PATH_E
u8 ret = 0; u8 ret = 0;
switch(eRFPath){ switch(eRFPath){
case RF90_PATH_A: case RF90_PATH_A:
for(i = 0;i<RadioA_ArrayLength; i=i+2){ for(i = 0;i<RadioA_ArrayLength; i=i+2){
if(rtl819XRadioA_Array[i] == 0xfe){
mdelay(100);
continue;
}
rtl8192_phy_SetRFReg(dev, eRFPath, rtl819XRadioA_Array[i], bMask12Bits, rtl819XRadioA_Array[i+1]);
mdelay(1);
if(rtl819XRadioA_Array[i] == 0xfe){
mdelay(100);
continue;
} }
break; rtl8192_phy_SetRFReg(dev, eRFPath, rtl819XRadioA_Array[i], bMask12Bits, rtl819XRadioA_Array[i+1]);
case RF90_PATH_B: mdelay(1);
for(i = 0;i<RadioB_ArrayLength; i=i+2){
if(rtl819XRadioB_Array[i] == 0xfe){ }
mdelay(100); break;
continue; case RF90_PATH_B:
} for(i = 0;i<RadioB_ArrayLength; i=i+2){
rtl8192_phy_SetRFReg(dev, eRFPath, rtl819XRadioB_Array[i], bMask12Bits, rtl819XRadioB_Array[i+1]);
mdelay(1);
if(rtl819XRadioB_Array[i] == 0xfe){
mdelay(100);
continue;
} }
break; rtl8192_phy_SetRFReg(dev, eRFPath, rtl819XRadioB_Array[i], bMask12Bits, rtl819XRadioB_Array[i+1]);
case RF90_PATH_C: mdelay(1);
for(i = 0;i<RadioC_ArrayLength; i=i+2){
if(rtl819XRadioC_Array[i] == 0xfe){ }
mdelay(100); break;
continue; case RF90_PATH_C:
} for(i = 0;i<RadioC_ArrayLength; i=i+2){
rtl8192_phy_SetRFReg(dev, eRFPath, rtl819XRadioC_Array[i], bMask12Bits, rtl819XRadioC_Array[i+1]);
mdelay(1);
if(rtl819XRadioC_Array[i] == 0xfe){
mdelay(100);
continue;
} }
break; rtl8192_phy_SetRFReg(dev, eRFPath, rtl819XRadioC_Array[i], bMask12Bits, rtl819XRadioC_Array[i+1]);
case RF90_PATH_D: mdelay(1);
for(i = 0;i<RadioD_ArrayLength; i=i+2){
if(rtl819XRadioD_Array[i] == 0xfe){ }
mdelay(100); break;
continue; case RF90_PATH_D:
} for(i = 0;i<RadioD_ArrayLength; i=i+2){
rtl8192_phy_SetRFReg(dev, eRFPath, rtl819XRadioD_Array[i], bMask12Bits, rtl819XRadioD_Array[i+1]);
mdelay(1);
if(rtl819XRadioD_Array[i] == 0xfe){
mdelay(100);
continue;
} }
break; rtl8192_phy_SetRFReg(dev, eRFPath, rtl819XRadioD_Array[i], bMask12Bits, rtl819XRadioD_Array[i+1]);
default: mdelay(1);
break;
}
break;
default:
break;
} }
return ret; return ret;