Commit be433db1 authored by John Whitmore's avatar John Whitmore Committed by Greg Kroah-Hartman
Browse files

staging:rtl8192u: Rename ba_param_set members - Style 



Rename the member variables of union ba_param_set to clear the
checkpatch issue with CamelCase naming:

AMSDU_Support  to  amsdu_support
BAPolicy       to  ba_policy
TID            to  tid
BufferSize     to  buffer_size

These are coding style changes which should have no impact on
runtime code execution.

Signed-off-by: default avatarJohn Whitmore <johnfwhitmore@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 21c875a5

drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h

+4 −4
Original line number Diff line number Diff line
@@ -33,10 +33,10 @@ union sequence_control { 
union ba_param_set {

	u16 short_data;

	struct {

		u16 AMSDU_Support:1;

		u16 BAPolicy:1;

		u16 TID:4;

		u16 BufferSize:10;

		u16 amsdu_support:1;

		u16 ba_policy:1;

		u16 tid:4;

		u16 buffer_size:10;

	} field;

};

drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c

+14 −14
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ static struct sk_buff *ieee80211_DELBA( 
	memset(&DelbaParamSet, 0, 2);



	DelbaParamSet.field.Initiator	= (TxRxSelect == TX_DIR) ? 1 : 0;

	DelbaParamSet.field.TID	= pBA->BaParamSet.field.TID;

	DelbaParamSet.field.TID	= pBA->BaParamSet.field.tid;



	skb = dev_alloc_skb(len + sizeof(struct rtl_80211_hdr_3addr)); //need to add something others? FIXME

	if (!skb) {
@@ -362,7 +362,7 @@ int ieee80211_rx_ADDBAReq(struct ieee80211_device *ieee, struct sk_buff *skb) 
			ieee,

			(struct ts_common_info **)(&pTS),

			dst,

			(u8)(pBaParamSet->field.TID),

			(u8)(pBaParamSet->field.tid),

			RX_DIR,

			true)) {

		rc = ADDBA_STATUS_REFUSED;
@@ -371,10 +371,10 @@ int ieee80211_rx_ADDBAReq(struct ieee80211_device *ieee, struct sk_buff *skb) 
	}

	pBA = &pTS->rx_admitted_ba_record;

	// To Determine the ADDBA Req content

	// We can do much more check here, including BufferSize, AMSDU_Support, Policy, StartSeqCtrl...

	// We can do much more check here, including buffer_size, AMSDU_Support, Policy, StartSeqCtrl...

	// I want to check StartSeqCtrl to make sure when we start aggregation!!!

	//

	if (pBaParamSet->field.BAPolicy == BA_POLICY_DELAYED) {

	if (pBaParamSet->field.ba_policy == BA_POLICY_DELAYED) {

		rc = ADDBA_STATUS_INVALID_PARAM;

		IEEE80211_DEBUG(IEEE80211_DL_ERR, "BA Policy is not correct in %s()\n", __func__);

		goto OnADDBAReq_Fail;
@@ -388,9 +388,9 @@ int ieee80211_rx_ADDBAReq(struct ieee80211_device *ieee, struct sk_buff *skb) 
	pBA->BaStartSeqCtrl = *pBaStartSeqCtrl;

	//for half N mode we only aggregate 1 frame

	if (ieee->GetHalfNmodeSupportByAPsHandler(ieee->dev))

	pBA->BaParamSet.field.BufferSize = 1;

	pBA->BaParamSet.field.buffer_size = 1;

	else

	pBA->BaParamSet.field.BufferSize = 32;

	pBA->BaParamSet.field.buffer_size = 32;

	ActivateBAEntry(ieee, pBA, pBA->BaTimeoutValue);

	ieee80211_send_ADDBARsp(ieee, dst, pBA, ADDBA_STATUS_SUCCESS);
@@ -403,7 +403,7 @@ int ieee80211_rx_ADDBAReq(struct ieee80211_device *ieee, struct sk_buff *skb) 
		BA.BaParamSet = *pBaParamSet;

		BA.BaTimeoutValue = *pBaTimeoutVal;

		BA.DialogToken = *pDialogToken;

		BA.BaParamSet.field.BAPolicy = BA_POLICY_IMMEDIATE;

		BA.BaParamSet.field.ba_policy = BA_POLICY_IMMEDIATE;

		ieee80211_send_ADDBARsp(ieee, dst, &BA, rc);

		return 0; //we send RSP out.

	}
@@ -461,7 +461,7 @@ int ieee80211_rx_ADDBARsp(struct ieee80211_device *ieee, struct sk_buff *skb) 
			ieee,

			(struct ts_common_info **)(&pTS),

			dst,

			(u8)(pBaParamSet->field.TID),

			(u8)(pBaParamSet->field.tid),

			TX_DIR,

			false)) {

		IEEE80211_DEBUG(IEEE80211_DL_ERR, "can't get TS in %s()\n", __func__);
@@ -498,7 +498,7 @@ int ieee80211_rx_ADDBARsp(struct ieee80211_device *ieee, struct sk_buff *skb) 
		// We can compare the value of BA parameter set that Peer returned and Self sent.

		// If it is OK, then admitted. Or we can send DELBA to cancel BA mechanism.

		//

		if (pBaParamSet->field.BAPolicy == BA_POLICY_DELAYED) {

		if (pBaParamSet->field.ba_policy == BA_POLICY_DELAYED) {

			// Since this is a kind of ADDBA failed, we delay next ADDBA process.

			pTS->add_ba_req_delayed = true;

			DeActivateBAEntry(ieee, pAdmittedBA);
@@ -624,11 +624,11 @@ TsInitAddBA( 
	DeActivateBAEntry(ieee, pBA);



	pBA->DialogToken++;						// DialogToken: Only keep the latest dialog token

	pBA->BaParamSet.field.AMSDU_Support = 0;	// Do not support A-MSDU with A-MPDU now!!

	pBA->BaParamSet.field.BAPolicy = Policy;	// Policy: Delayed or Immediate

	pBA->BaParamSet.field.TID = pTS->ts_common_info.t_spec.ts_info.uc_tsid;	// TID

	// BufferSize: This need to be set according to A-MPDU vector

	pBA->BaParamSet.field.BufferSize = 32;		// BufferSize: This need to be set according to A-MPDU vector

	pBA->BaParamSet.field.amsdu_support = 0;	// Do not support A-MSDU with A-MPDU now!!

	pBA->BaParamSet.field.ba_policy = Policy;	// Policy: Delayed or Immediate

	pBA->BaParamSet.field.tid = pTS->ts_common_info.t_spec.ts_info.uc_tsid;	// TID

	// buffer_size: This need to be set according to A-MPDU vector

	pBA->BaParamSet.field.buffer_size = 32;		// buffer_size: This need to be set according to A-MPDU vector

	pBA->BaTimeoutValue = 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.