Commit 092bc4e7 authored by William Durand's avatar William Durand Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: rename BaTimeoutValue to ba_timeout_value in ba_record struct

parent ffa3d0a1
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ struct ba_record {
	u8				b_valid;
	u8				dialog_token;
	union ba_param_set ba_param_set;
	u16				BaTimeoutValue;
	u16				ba_timeout_value;
	union sequence_control BaStartSeqCtrl;
};

+6 −6
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ void ResetBaEntry(struct ba_record *pBA)
{
	pBA->b_valid			= false;
	pBA->ba_param_set.short_data	= 0;
	pBA->BaTimeoutValue		= 0;
	pBA->ba_timeout_value		= 0;
	pBA->dialog_token		= 0;
	pBA->BaStartSeqCtrl.short_data	= 0;
}
@@ -110,7 +110,7 @@ static struct sk_buff *rtllib_ADDBA(struct rtllib_device *ieee, u8 *Dst,
	put_unaligned_le16(pBA->ba_param_set.short_data, tag);
	tag += 2;

	put_unaligned_le16(pBA->BaTimeoutValue, tag);
	put_unaligned_le16(pBA->ba_timeout_value, tag);
	tag += 2;

	if (type == ACT_ADDBAREQ) {
@@ -279,7 +279,7 @@ int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, struct sk_buff *skb)
	DeActivateBAEntry(ieee, pBA);
	pBA->dialog_token = *pDialogToken;
	pBA->ba_param_set = *pBaParamSet;
	pBA->BaTimeoutValue = *pBaTimeoutVal;
	pBA->ba_timeout_value = *pBaTimeoutVal;
	pBA->BaStartSeqCtrl = *pBaStartSeqCtrl;

	if (ieee->GetHalfNmodeSupportByAPsHandler(ieee->dev) ||
@@ -298,7 +298,7 @@ int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, struct sk_buff *skb)
		struct ba_record BA;

		BA.ba_param_set = *pBaParamSet;
		BA.BaTimeoutValue = *pBaTimeoutVal;
		BA.ba_timeout_value = *pBaTimeoutVal;
		BA.dialog_token = *pDialogToken;
		BA.ba_param_set.field.ba_policy = BA_POLICY_IMMEDIATE;
		rtllib_send_ADDBARsp(ieee, dst, &BA, rc);
@@ -386,7 +386,7 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb)


		pAdmittedBA->dialog_token = *pDialogToken;
		pAdmittedBA->BaTimeoutValue = *pBaTimeoutVal;
		pAdmittedBA->ba_timeout_value = *pBaTimeoutVal;
		pAdmittedBA->BaStartSeqCtrl = pPendingBA->BaStartSeqCtrl;
		pAdmittedBA->ba_param_set = *pBaParamSet;
		DeActivateBAEntry(ieee, pAdmittedBA);
@@ -487,7 +487,7 @@ void TsInitAddBA(struct rtllib_device *ieee, struct tx_ts_record *pTS,
	pBA->ba_param_set.field.ba_policy = Policy;
	pBA->ba_param_set.field.tid = pTS->TsCommonInfo.TSpec.f.TSInfo.field.ucTSID;
	pBA->ba_param_set.field.buffer_size = 32;
	pBA->BaTimeoutValue = 0;
	pBA->ba_timeout_value = 0;
	pBA->BaStartSeqCtrl.field.seq_num = (pTS->TxCurSeq + 3) % 4096;

	ActivateBAEntry(ieee, pBA, BA_SETUP_TIMEOUT);