staging:rtl8192u: Rename BaStartSeqCtrl - Style (9f488710) · Commits · 戴 / test

drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -342,7 +342,7 @@ static void ieee80211_tx_query_agg_cap(struct ieee80211_device *ieee,
		}
		else if (!pTxTs->using_ba)
		{
		if (SN_LESS(pTxTs->tx_admitted_ba_record.BaStartSeqCtrl.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;
		else
		goto FORCED_AGG_SETTING;

drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -55,7 +55,7 @@ struct ba_record {
		u8 dialog_token;
		union ba_param_set param_set;
		u16 timeout_value;
		union sequence_control BaStartSeqCtrl;
		union sequence_control start_seq_ctrl;
		};

		#endif //end _BATYPE_H_

drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -93,7 +93,7 @@ void ResetBaEntry(struct ba_record *pBA)
		pBA->param_set.short_data = 0;
		pBA->timeout_value = 0;
		pBA->dialog_token = 0;
		pBA->BaStartSeqCtrl.short_data = 0;
		pBA->start_seq_ctrl.short_data = 0;
		}
		//These functions need porting here or not?
		/*******************************************************************************************************************************
		@@ -160,7 +160,7 @@ static struct sk_buff ieee80211_ADDBA(struct ieee80211_device ieee, u8 *Dst, s

		if (ACT_ADDBAREQ == type) {
		// BA Start SeqCtrl
		memcpy(tag, (u8 *)&(pBA->BaStartSeqCtrl), 2);
		memcpy(tag, (u8 *)&(pBA->start_seq_ctrl), 2);
		tag += 2;
		}

		@@ -385,7 +385,7 @@ int ieee80211_rx_ADDBAReq(struct ieee80211_device ieee, struct sk_buff skb)
		pBA->dialog_token = *pDialogToken;
		pBA->param_set = *pBaParamSet;
		pBA->timeout_value = *pBaTimeoutVal;
		pBA->BaStartSeqCtrl = *pBaStartSeqCtrl;
		pBA->start_seq_ctrl = *pBaStartSeqCtrl;
		//for half N mode we only aggregate 1 frame
		if (ieee->GetHalfNmodeSupportByAPsHandler(ieee->dev))
		pBA->param_set.field.buffer_size = 1;
		@@ -512,7 +512,7 @@ int ieee80211_rx_ADDBARsp(struct ieee80211_device ieee, struct sk_buff skb)
		//
		pAdmittedBA->dialog_token = *pDialogToken;
		pAdmittedBA->timeout_value = *pBaTimeoutVal;
		pAdmittedBA->BaStartSeqCtrl = pPendingBA->BaStartSeqCtrl;
		pAdmittedBA->start_seq_ctrl = pPendingBA->start_seq_ctrl;
		pAdmittedBA->param_set = *pBaParamSet;
		DeActivateBAEntry(ieee, pAdmittedBA);
		ActivateBAEntry(ieee, pAdmittedBA, *pBaTimeoutVal);
		@@ -630,7 +630,7 @@ TsInitAddBA(
		// buffer_size: This need to be set according to A-MPDU vector
		pBA->param_set.field.buffer_size = 32; // buffer_size: This need to be set according to A-MPDU vector
		pBA->timeout_value = 0; // Timeout value: Set 0 to disable Timer
		pBA->BaStartSeqCtrl.field.seq_num = (pTS->tx_cur_seq + 3) % 4096; // Block Ack will start after 3 packets later.
		pBA->start_seq_ctrl.field.seq_num = (pTS->tx_cur_seq + 3) % 4096; // Block Ack will start after 3 packets later.

		ActivateBAEntry(ieee, pBA, BA_SETUP_TIMEOUT);

Admin message