|
@@ -42,7 +42,7 @@ static void DeActivateBAEntry(struct ieee80211_device *ieee, PBA_RECORD pBA)
|
|
|
********************************************************************************************************************/
|
|
|
static u8 TxTsDeleteBA(struct ieee80211_device *ieee, struct tx_ts_record *pTxTs)
|
|
|
{
|
|
|
- PBA_RECORD pAdmittedBa = &pTxTs->TxAdmittedBARecord; //These two BA entries must exist in TS structure
|
|
|
+ PBA_RECORD pAdmittedBa = &pTxTs->tx_admitted_ba_record; //These two BA entries must exist in TS structure
|
|
|
PBA_RECORD pPendingBa = &pTxTs->tx_pending_ba_record;
|
|
|
u8 bSendDELBA = false;
|
|
|
|
|
@@ -471,7 +471,7 @@ int ieee80211_rx_ADDBARsp(struct ieee80211_device *ieee, struct sk_buff *skb)
|
|
|
|
|
|
pTS->bAddBaReqInProgress = false;
|
|
|
pPendingBA = &pTS->tx_pending_ba_record;
|
|
|
- pAdmittedBA = &pTS->TxAdmittedBARecord;
|
|
|
+ pAdmittedBA = &pTS->tx_admitted_ba_record;
|
|
|
|
|
|
|
|
|
//
|
|
@@ -647,7 +647,7 @@ TsInitDelBA(struct ieee80211_device *ieee, struct ts_common_info *pTsCommonInfo,
|
|
|
ieee80211_send_DELBA(
|
|
|
ieee,
|
|
|
pTsCommonInfo->addr,
|
|
|
- (pTxTs->TxAdmittedBARecord.bValid)?(&pTxTs->TxAdmittedBARecord):(&pTxTs->tx_pending_ba_record),
|
|
|
+ (pTxTs->tx_admitted_ba_record.bValid)?(&pTxTs->tx_admitted_ba_record):(&pTxTs->tx_pending_ba_record),
|
|
|
TxRxSelect,
|
|
|
DELBA_REASON_END_BA);
|
|
|
} else if (TxRxSelect == RX_DIR) {
|
|
@@ -678,13 +678,13 @@ void BaSetupTimeOut(struct timer_list *t)
|
|
|
|
|
|
void TxBaInactTimeout(struct timer_list *t)
|
|
|
{
|
|
|
- struct tx_ts_record *pTxTs = from_timer(pTxTs, t, TxAdmittedBARecord.Timer);
|
|
|
+ struct tx_ts_record *pTxTs = from_timer(pTxTs, t, tx_admitted_ba_record.Timer);
|
|
|
struct ieee80211_device *ieee = container_of(pTxTs, struct ieee80211_device, TxTsRecord[pTxTs->num]);
|
|
|
TxTsDeleteBA(ieee, pTxTs);
|
|
|
ieee80211_send_DELBA(
|
|
|
ieee,
|
|
|
pTxTs->ts_common_info.addr,
|
|
|
- &pTxTs->TxAdmittedBARecord,
|
|
|
+ &pTxTs->tx_admitted_ba_record,
|
|
|
TX_DIR,
|
|
|
DELBA_REASON_TIMEOUT);
|
|
|
}
|