diff options
Diffstat (limited to 'drivers/staging/rt3070/common/action.c')
-rw-r--r-- | drivers/staging/rt3070/common/action.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/drivers/staging/rt3070/common/action.c b/drivers/staging/rt3070/common/action.c index e36f90f46a4..c31d367908a 100644 --- a/drivers/staging/rt3070/common/action.c +++ b/drivers/staging/rt3070/common/action.c | |||
@@ -128,7 +128,6 @@ VOID MlmeADDBAAction( | |||
128 | pBAEntry =&pAd->BATable.BAOriEntry[Idx]; | 128 | pBAEntry =&pAd->BATable.BAOriEntry[Idx]; |
129 | } | 129 | } |
130 | 130 | ||
131 | #ifdef CONFIG_STA_SUPPORT | ||
132 | IF_DEV_CONFIG_OPMODE_ON_STA(pAd) | 131 | IF_DEV_CONFIG_OPMODE_ON_STA(pAd) |
133 | { | 132 | { |
134 | if (ADHOC_ON(pAd)) | 133 | if (ADHOC_ON(pAd)) |
@@ -137,7 +136,6 @@ VOID MlmeADDBAAction( | |||
137 | ActHeaderInit(pAd, &Frame.Hdr, pAd->CommonCfg.Bssid, pAd->CurrentAddress, pInfo->pAddr); | 136 | ActHeaderInit(pAd, &Frame.Hdr, pAd->CommonCfg.Bssid, pAd->CurrentAddress, pInfo->pAddr); |
138 | 137 | ||
139 | } | 138 | } |
140 | #endif // CONFIG_STA_SUPPORT // | ||
141 | 139 | ||
142 | Frame.Category = CATEGORY_BA; | 140 | Frame.Category = CATEGORY_BA; |
143 | Frame.Action = ADDBA_REQ; | 141 | Frame.Action = ADDBA_REQ; |
@@ -214,10 +212,8 @@ VOID MlmeDELBAAction( | |||
214 | // SEND BAR (Send BAR to refresh peer reordering buffer.) | 212 | // SEND BAR (Send BAR to refresh peer reordering buffer.) |
215 | Idx = pAd->MacTab.Content[pInfo->Wcid].BAOriWcidArray[pInfo->TID]; | 213 | Idx = pAd->MacTab.Content[pInfo->Wcid].BAOriWcidArray[pInfo->TID]; |
216 | 214 | ||
217 | #ifdef CONFIG_STA_SUPPORT | ||
218 | IF_DEV_CONFIG_OPMODE_ON_STA(pAd) | 215 | IF_DEV_CONFIG_OPMODE_ON_STA(pAd) |
219 | BarHeaderInit(pAd, &FrameBar, pAd->MacTab.Content[pInfo->Wcid].Addr, pAd->CurrentAddress); | 216 | BarHeaderInit(pAd, &FrameBar, pAd->MacTab.Content[pInfo->Wcid].Addr, pAd->CurrentAddress); |
220 | #endif // CONFIG_STA_SUPPORT // | ||
221 | 217 | ||
222 | FrameBar.StartingSeq.field.FragNum = 0; // make sure sequence not clear in DEL funciton. | 218 | FrameBar.StartingSeq.field.FragNum = 0; // make sure sequence not clear in DEL funciton. |
223 | FrameBar.StartingSeq.field.StartSeq = pAd->MacTab.Content[pInfo->Wcid].TxSeq[pInfo->TID]; // make sure sequence not clear in DEL funciton. | 219 | FrameBar.StartingSeq.field.StartSeq = pAd->MacTab.Content[pInfo->Wcid].TxSeq[pInfo->TID]; // make sure sequence not clear in DEL funciton. |
@@ -235,7 +231,7 @@ VOID MlmeDELBAAction( | |||
235 | 231 | ||
236 | // SEND DELBA FRAME | 232 | // SEND DELBA FRAME |
237 | FrameLen = 0; | 233 | FrameLen = 0; |
238 | #ifdef CONFIG_STA_SUPPORT | 234 | |
239 | IF_DEV_CONFIG_OPMODE_ON_STA(pAd) | 235 | IF_DEV_CONFIG_OPMODE_ON_STA(pAd) |
240 | { | 236 | { |
241 | if (ADHOC_ON(pAd)) | 237 | if (ADHOC_ON(pAd)) |
@@ -243,7 +239,7 @@ VOID MlmeDELBAAction( | |||
243 | else | 239 | else |
244 | ActHeaderInit(pAd, &Frame.Hdr, pAd->CommonCfg.Bssid, pAd->CurrentAddress, pAd->MacTab.Content[pInfo->Wcid].Addr); | 240 | ActHeaderInit(pAd, &Frame.Hdr, pAd->CommonCfg.Bssid, pAd->CurrentAddress, pAd->MacTab.Content[pInfo->Wcid].Addr); |
245 | } | 241 | } |
246 | #endif // CONFIG_STA_SUPPORT // | 242 | |
247 | Frame.Category = CATEGORY_BA; | 243 | Frame.Category = CATEGORY_BA; |
248 | Frame.Action = DELBA; | 244 | Frame.Action = DELBA; |
249 | Frame.DelbaParm.Initiator = pInfo->Initiator; | 245 | Frame.DelbaParm.Initiator = pInfo->Initiator; |
@@ -370,7 +366,6 @@ static VOID respond_ht_information_exchange_action( | |||
370 | 366 | ||
371 | NdisZeroMemory(&HTINFOframe, sizeof(FRAME_HT_INFO)); | 367 | NdisZeroMemory(&HTINFOframe, sizeof(FRAME_HT_INFO)); |
372 | // 2-1. Prepare ADDBA Response frame. | 368 | // 2-1. Prepare ADDBA Response frame. |
373 | #ifdef CONFIG_STA_SUPPORT | ||
374 | IF_DEV_CONFIG_OPMODE_ON_STA(pAd) | 369 | IF_DEV_CONFIG_OPMODE_ON_STA(pAd) |
375 | { | 370 | { |
376 | if (ADHOC_ON(pAd)) | 371 | if (ADHOC_ON(pAd)) |
@@ -378,7 +373,6 @@ static VOID respond_ht_information_exchange_action( | |||
378 | else | 373 | else |
379 | ActHeaderInit(pAd, &HTINFOframe.Hdr, pAd->CommonCfg.Bssid, pAd->CurrentAddress, pAddr); | 374 | ActHeaderInit(pAd, &HTINFOframe.Hdr, pAd->CommonCfg.Bssid, pAd->CurrentAddress, pAddr); |
380 | } | 375 | } |
381 | #endif // CONFIG_STA_SUPPORT // | ||
382 | 376 | ||
383 | HTINFOframe.Category = CATEGORY_HT; | 377 | HTINFOframe.Category = CATEGORY_HT; |
384 | HTINFOframe.Action = HT_INFO_EXCHANGE; | 378 | HTINFOframe.Action = HT_INFO_EXCHANGE; |
@@ -407,7 +401,7 @@ VOID PeerHTAction( | |||
407 | { | 401 | { |
408 | case NOTIFY_BW_ACTION: | 402 | case NOTIFY_BW_ACTION: |
409 | DBGPRINT(RT_DEBUG_TRACE,("ACTION - HT Notify Channel bandwidth action----> \n")); | 403 | DBGPRINT(RT_DEBUG_TRACE,("ACTION - HT Notify Channel bandwidth action----> \n")); |
410 | #ifdef CONFIG_STA_SUPPORT | 404 | |
411 | if(pAd->StaActive.SupportedPhyInfo.bHtEnable == FALSE) | 405 | if(pAd->StaActive.SupportedPhyInfo.bHtEnable == FALSE) |
412 | { | 406 | { |
413 | // Note, this is to patch DIR-1353 AP. When the AP set to Wep, it will use legacy mode. But AP still keeps | 407 | // Note, this is to patch DIR-1353 AP. When the AP set to Wep, it will use legacy mode. But AP still keeps |
@@ -417,7 +411,6 @@ VOID PeerHTAction( | |||
417 | Elem->Msg[LENGTH_802_11+2] )); | 411 | Elem->Msg[LENGTH_802_11+2] )); |
418 | break; | 412 | break; |
419 | } | 413 | } |
420 | #endif // CONFIG_STA_SUPPORT // | ||
421 | 414 | ||
422 | if (Elem->Msg[LENGTH_802_11+2] == 0) // 7.4.8.2. if value is 1, keep the same as supported channel bandwidth. | 415 | if (Elem->Msg[LENGTH_802_11+2] == 0) // 7.4.8.2. if value is 1, keep the same as supported channel bandwidth. |
423 | pAd->MacTab.Content[Elem->Wcid].HTPhyMode.field.BW = 0; | 416 | pAd->MacTab.Content[Elem->Wcid].HTPhyMode.field.BW = 0; |
@@ -546,11 +539,8 @@ VOID SendRefreshBAR( | |||
546 | 539 | ||
547 | Sequence = pEntry->TxSeq[TID]; | 540 | Sequence = pEntry->TxSeq[TID]; |
548 | 541 | ||
549 | |||
550 | #ifdef CONFIG_STA_SUPPORT | ||
551 | IF_DEV_CONFIG_OPMODE_ON_STA(pAd) | 542 | IF_DEV_CONFIG_OPMODE_ON_STA(pAd) |
552 | BarHeaderInit(pAd, &FrameBar, pEntry->Addr, pAd->CurrentAddress); | 543 | BarHeaderInit(pAd, &FrameBar, pEntry->Addr, pAd->CurrentAddress); |
553 | #endif // CONFIG_STA_SUPPORT // | ||
554 | 544 | ||
555 | FrameBar.StartingSeq.field.FragNum = 0; // make sure sequence not clear in DEL function. | 545 | FrameBar.StartingSeq.field.FragNum = 0; // make sure sequence not clear in DEL function. |
556 | FrameBar.StartingSeq.field.StartSeq = Sequence; // make sure sequence not clear in DEL funciton. | 546 | FrameBar.StartingSeq.field.StartSeq = Sequence; // make sure sequence not clear in DEL funciton. |