Commit d542d407 authored by Puranjay Mohan's avatar Puranjay Mohan Committed by Greg Kroah-Hartman

Staging: rtl8192u: ieee80211: Fix coding style errors

Fix coding style errors related to braces for if-else statements.
Signed-off-by: default avatarPuranjay Mohan <puranjay12@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d310c5a1
...@@ -169,8 +169,7 @@ int ieee80211_encrypt_fragment( ...@@ -169,8 +169,7 @@ int ieee80211_encrypt_fragment(
struct ieee80211_crypt_data *crypt = ieee->crypt[ieee->tx_keyidx]; struct ieee80211_crypt_data *crypt = ieee->crypt[ieee->tx_keyidx];
int res; int res;
if (!(crypt && crypt->ops)) if (!(crypt && crypt->ops)) {
{
printk("=========>%s(), crypt is null\n", __func__); printk("=========>%s(), crypt is null\n", __func__);
return -1; return -1;
} }
...@@ -309,32 +308,25 @@ static void ieee80211_tx_query_agg_cap(struct ieee80211_device *ieee, ...@@ -309,32 +308,25 @@ static void ieee80211_tx_query_agg_cap(struct ieee80211_device *ieee,
if (!Adapter->HalFunc.GetNmodeSupportBySecCfgHandler(Adapter)) if (!Adapter->HalFunc.GetNmodeSupportBySecCfgHandler(Adapter))
return; return;
#endif #endif
if (!ieee->GetNmodeSupportBySecCfg(ieee->dev)) if (!ieee->GetNmodeSupportBySecCfg(ieee->dev)) {
{
return; return;
} }
if (pHTInfo->bCurrentAMPDUEnable) if (pHTInfo->bCurrentAMPDUEnable) {
{ if (!GetTs(ieee, (struct ts_common_info **)(&pTxTs), hdr->addr1, skb->priority, TX_DIR, true)) {
if (!GetTs(ieee, (struct ts_common_info **)(&pTxTs), hdr->addr1, skb->priority, TX_DIR, true))
{
printk("===>can't get TS\n"); printk("===>can't get TS\n");
return; return;
} }
if (!pTxTs->tx_admitted_ba_record.valid) if (!pTxTs->tx_admitted_ba_record.valid) {
{
TsStartAddBaProcess(ieee, pTxTs); TsStartAddBaProcess(ieee, pTxTs);
goto FORCED_AGG_SETTING; goto FORCED_AGG_SETTING;
} } else if (!pTxTs->using_ba) {
else if (!pTxTs->using_ba)
{
if (SN_LESS(pTxTs->tx_admitted_ba_record.start_seq_ctrl.field.seq_num, (pTxTs->tx_cur_seq + 1) % 4096)) if (SN_LESS(pTxTs->tx_admitted_ba_record.start_seq_ctrl.field.seq_num, (pTxTs->tx_cur_seq + 1) % 4096))
pTxTs->using_ba = true; pTxTs->using_ba = true;
else else
goto FORCED_AGG_SETTING; goto FORCED_AGG_SETTING;
} }
if (ieee->iw_mode == IW_MODE_INFRA) if (ieee->iw_mode == IW_MODE_INFRA) {
{
tcb_desc->bAMPDUEnable = true; tcb_desc->bAMPDUEnable = true;
tcb_desc->ampdu_factor = pHTInfo->CurrentAMPDUFactor; tcb_desc->ampdu_factor = pHTInfo->CurrentAMPDUFactor;
tcb_desc->ampdu_density = pHTInfo->CurrentMPDUDensity; tcb_desc->ampdu_density = pHTInfo->CurrentMPDUDensity;
...@@ -366,12 +358,9 @@ static void ieee80211_qurey_ShortPreambleMode(struct ieee80211_device *ieee, ...@@ -366,12 +358,9 @@ static void ieee80211_qurey_ShortPreambleMode(struct ieee80211_device *ieee,
struct cb_desc *tcb_desc) struct cb_desc *tcb_desc)
{ {
tcb_desc->bUseShortPreamble = false; tcb_desc->bUseShortPreamble = false;
if (tcb_desc->data_rate == 2) if (tcb_desc->data_rate == 2) {//// 1M can only use Long Preamble. 11B spec
{//// 1M can only use Long Preamble. 11B spec
return; return;
} } else if (ieee->current_network.capability & WLAN_CAPABILITY_SHORT_PREAMBLE) {
else if (ieee->current_network.capability & WLAN_CAPABILITY_SHORT_PREAMBLE)
{
tcb_desc->bUseShortPreamble = true; tcb_desc->bUseShortPreamble = true;
} }
return; return;
...@@ -386,8 +375,7 @@ ieee80211_query_HTCapShortGI(struct ieee80211_device *ieee, struct cb_desc *tcb_ ...@@ -386,8 +375,7 @@ ieee80211_query_HTCapShortGI(struct ieee80211_device *ieee, struct cb_desc *tcb_
if (!pHTInfo->bCurrentHTSupport||!pHTInfo->bEnableHT) if (!pHTInfo->bCurrentHTSupport||!pHTInfo->bEnableHT)
return; return;
if (pHTInfo->bForcedShortGI) if (pHTInfo->bForcedShortGI) {
{
tcb_desc->bUseShortGI = true; tcb_desc->bUseShortGI = true;
return; return;
} }
...@@ -535,27 +523,25 @@ static void ieee80211_txrate_selectmode(struct ieee80211_device *ieee, ...@@ -535,27 +523,25 @@ static void ieee80211_txrate_selectmode(struct ieee80211_device *ieee,
struct cb_desc *tcb_desc) struct cb_desc *tcb_desc)
{ {
#ifdef TO_DO_LIST #ifdef TO_DO_LIST
if(!IsDataFrame(pFrame)) if (!IsDataFrame(pFrame)) {
{
pTcb->bTxDisableRateFallBack = true; pTcb->bTxDisableRateFallBack = true;
pTcb->bTxUseDriverAssingedRate = true; pTcb->bTxUseDriverAssingedRate = true;
pTcb->RATRIndex = 7; pTcb->RATRIndex = 7;
return; return;
} }
if(pMgntInfo->ForcedDataRate!= 0) if (pMgntInfo->ForcedDataRate!= 0) {
{
pTcb->bTxDisableRateFallBack = true; pTcb->bTxDisableRateFallBack = true;
pTcb->bTxUseDriverAssingedRate = true; pTcb->bTxUseDriverAssingedRate = true;
return; return;
} }
#endif #endif
if(ieee->bTxDisableRateFallBack) if (ieee->bTxDisableRateFallBack)
tcb_desc->bTxDisableRateFallBack = true; tcb_desc->bTxDisableRateFallBack = true;
if(ieee->bTxUseDriverAssingedRate) if (ieee->bTxUseDriverAssingedRate)
tcb_desc->bTxUseDriverAssingedRate = true; tcb_desc->bTxUseDriverAssingedRate = true;
if(!tcb_desc->bTxDisableRateFallBack || !tcb_desc->bTxUseDriverAssingedRate) if (!tcb_desc->bTxDisableRateFallBack || !tcb_desc->bTxUseDriverAssingedRate)
{ {
if (ieee->iw_mode == IW_MODE_INFRA || ieee->iw_mode == IW_MODE_ADHOC) if (ieee->iw_mode == IW_MODE_INFRA || ieee->iw_mode == IW_MODE_ADHOC)
tcb_desc->RATRIndex = 0; tcb_desc->RATRIndex = 0;
...@@ -614,7 +600,7 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -614,7 +600,7 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev)
} }
if(likely(ieee->raw_tx == 0)){ if (likely(ieee->raw_tx == 0)) {
if (unlikely(skb->len < SNAP_SIZE + sizeof(u16))) { if (unlikely(skb->len < SNAP_SIZE + sizeof(u16))) {
printk(KERN_WARNING "%s: skb too small (%d).\n", printk(KERN_WARNING "%s: skb too small (%d).\n",
ieee->dev->name, skb->len); ieee->dev->name, skb->len);
...@@ -690,15 +676,13 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -690,15 +676,13 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev)
if (is_multicast_ether_addr(header.addr1)) { if (is_multicast_ether_addr(header.addr1)) {
frag_size = MAX_FRAG_THRESHOLD; frag_size = MAX_FRAG_THRESHOLD;
qos_ctl |= QOS_CTL_NOTCONTAIN_ACK; qos_ctl |= QOS_CTL_NOTCONTAIN_ACK;
} } else {
else {
frag_size = ieee->fts;//default:392 frag_size = ieee->fts;//default:392
qos_ctl = 0; qos_ctl = 0;
} }
//if (ieee->current_network.QoS_Enable) //if (ieee->current_network.QoS_Enable)
if(qos_actived) if (qos_actived) {
{
hdr_len = IEEE80211_3ADDR_LEN + 2; hdr_len = IEEE80211_3ADDR_LEN + 2;
skb->priority = ieee80211_classify(skb, &ieee->current_network); skb->priority = ieee80211_classify(skb, &ieee->current_network);
...@@ -746,12 +730,10 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -746,12 +730,10 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev)
txb->payload_size = __cpu_to_le16(bytes); txb->payload_size = __cpu_to_le16(bytes);
//if (ieee->current_network.QoS_Enable) //if (ieee->current_network.QoS_Enable)
if(qos_actived) if (qos_actived)
{
txb->queue_index = UP2AC(skb->priority); txb->queue_index = UP2AC(skb->priority);
} else { else
txb->queue_index = WME_AC_BK; txb->queue_index = WME_AC_BK;
}
......
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