Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81108afb authored by Larry Finger's avatar Larry Finger
Browse files

staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part V 



Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
parent b0969341

drivers/staging/rtl8192e/rtl819x_BA.h

+2 −3
Original line number Diff line number Diff line
@@ -38,8 +38,7 @@ 
#define	DELBA_REASON_TIMEOUT			39

union sequence_control {

	u16 ShortData;

	struct

	{

	struct {

		u16	FragNum:4;

		u16	SeqNum:12;

	} field;

drivers/staging/rtl8192e/rtl819x_BAProc.c

+189 −214
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ 
#include "rtl819x_BA.h"

#include "rtl_core.h"



void ActivateBAEntry(struct rtllib_device* ieee, struct ba_record *pBA, u16 Time)

void ActivateBAEntry(struct rtllib_device *ieee, struct ba_record *pBA,

		     u16 Time)

{

	pBA->bValid = true;

	if (Time != 0)
@@ -32,24 +33,22 @@ void DeActivateBAEntry( struct rtllib_device* ieee, struct ba_record *pBA) 
	pBA->bValid = false;

	del_timer_sync(&pBA->Timer);

}



u8 TxTsDeleteBA(struct rtllib_device *ieee, struct tx_ts_record *pTxTs)

{

	struct ba_record *pAdmittedBa = &pTxTs->TxAdmittedBARecord;

	struct ba_record *pPendingBa = &pTxTs->TxPendingBARecord;

	u8 bSendDELBA = false;



	if (pPendingBa->bValid)

	{

	if (pPendingBa->bValid) {

		DeActivateBAEntry(ieee, pPendingBa);

		bSendDELBA = true;

	}



	if (pAdmittedBa->bValid)

	{

	if (pAdmittedBa->bValid) {

		DeActivateBAEntry(ieee, pAdmittedBa);

		bSendDELBA = true;

	}



	return bSendDELBA;

}
@@ -58,8 +57,7 @@ u8 RxTsDeleteBA( struct rtllib_device* ieee, struct rx_ts_record *pRxTs) 
	struct ba_record *pBa = &pRxTs->RxAdmittedBARecord;

	u8			bSendDELBA = false;



	if (pBa->bValid)

	{

	if (pBa->bValid) {

		DeActivateBAEntry(ieee, pBa);

		bSendDELBA = true;

	}
@@ -75,22 +73,25 @@ void ResetBaEntry( struct ba_record *pBA) 
	pBA->DialogToken		= 0;

	pBA->BaStartSeqCtrl.ShortData	= 0;

}

static struct sk_buff* rtllib_ADDBA(struct rtllib_device* ieee, u8* Dst, struct ba_record *pBA, u16 StatusCode, u8 type)

static struct sk_buff *rtllib_ADDBA(struct rtllib_device *ieee, u8 *Dst,

				    struct ba_record *pBA,

				    u16 StatusCode, u8 type)

{

	struct sk_buff *skb = NULL;

	 struct rtllib_hdr_3addr *BAReq = NULL;

	u8 *tag = NULL;

	u16 tmp = 0;

	u16 len = ieee->tx_headroom + 9;

	RTLLIB_DEBUG(RTLLIB_DL_TRACE | RTLLIB_DL_BA, "========>%s(), frame(%d) sentd to:"MAC_FMT", ieee->dev:%p\n", __func__, type, MAC_ARG(Dst), ieee->dev);

	if (pBA == NULL||ieee == NULL)

	{

		RTLLIB_DEBUG(RTLLIB_DL_ERR, "pBA(%p) is NULL or ieee(%p) is NULL\n", pBA, ieee);

	RTLLIB_DEBUG(RTLLIB_DL_TRACE | RTLLIB_DL_BA, "========>%s(), frame(%d)"

		     " sentd to:"MAC_FMT", ieee->dev:%p\n", __func__,

		     type, MAC_ARG(Dst), ieee->dev);

	if (pBA == NULL || ieee == NULL) {

		RTLLIB_DEBUG(RTLLIB_DL_ERR, "pBA(%p) is NULL or ieee(%p) is "

			     "NULL\n", pBA, ieee);

		return NULL;

	}

	skb = dev_alloc_skb(len + sizeof(struct rtllib_hdr_3addr));

	if (skb == NULL)

	{

	if (skb == NULL) {

		RTLLIB_DEBUG(RTLLIB_DL_ERR, "can't alloc skb for ADDBA_REQ\n");

		return NULL;

	}
@@ -99,7 +100,8 @@ static struct sk_buff* rtllib_ADDBA(struct rtllib_device* ieee, u8* Dst, struct 


	skb_reserve(skb, ieee->tx_headroom);



	BAReq = ( struct rtllib_hdr_3addr *) skb_put(skb,sizeof( struct rtllib_hdr_3addr));

	BAReq = (struct rtllib_hdr_3addr *)skb_put(skb,

		 sizeof(struct rtllib_hdr_3addr));



	memcpy(BAReq->addr1, Dst, ETH_ALEN);

	memcpy(BAReq->addr2, ieee->dev->dev_addr, ETH_ALEN);
@@ -112,8 +114,7 @@ static struct sk_buff* rtllib_ADDBA(struct rtllib_device* ieee, u8* Dst, struct 
	*tag ++= type;

	*tag ++= pBA->DialogToken;



	if (ACT_ADDBARSP == type)

	{

	if (ACT_ADDBARSP == type) {

		RT_TRACE(COMP_DBG, "====>to send ADDBARSP\n");

		tmp = cpu_to_le16(StatusCode);

		memcpy(tag, (u8 *)&tmp, 2);
@@ -126,8 +127,7 @@ static struct sk_buff* rtllib_ADDBA(struct rtllib_device* ieee, u8* Dst, struct 
	memcpy(tag, (u8 *)&tmp, 2);

	tag += 2;



	if (ACT_ADDBAREQ == type)

	{

	if (ACT_ADDBAREQ == type) {

		memcpy(tag, (u8 *)&(pBA->BaStartSeqCtrl), 2);

		tag += 2;

	}
@@ -136,13 +136,9 @@ static struct sk_buff* rtllib_ADDBA(struct rtllib_device* ieee, u8* Dst, struct 
	return skb;

}



static struct sk_buff* rtllib_DELBA(

	struct rtllib_device* ieee,

	u8*		         dst,

static struct sk_buff *rtllib_DELBA(struct rtllib_device *ieee, u8 *dst,

				    struct ba_record *pBA,

	enum tr_select TxRxSelect,

	u16			 ReasonCode

	)

				    enum tr_select TxRxSelect, u16 ReasonCode)

{

	union delba_param_set DelbaParamSet;

	struct sk_buff *skb = NULL;
@@ -152,7 +148,10 @@ static struct sk_buff* rtllib_DELBA( 
	u16 len = 6 + ieee->tx_headroom;



	if (net_ratelimit())

	RTLLIB_DEBUG(RTLLIB_DL_TRACE | RTLLIB_DL_BA, "========>%s(), ReasonCode(%d) sentd to:"MAC_FMT"\n", __func__, ReasonCode, MAC_ARG(dst));

		RTLLIB_DEBUG(RTLLIB_DL_TRACE | RTLLIB_DL_BA,

			     "========>%s(), Reason"

			     "Code(%d) sentd to:"MAC_FMT"\n", __func__,

			     ReasonCode, MAC_ARG(dst));



	memset(&DelbaParamSet, 0, 2);
@@ -160,15 +159,15 @@ static struct sk_buff* rtllib_DELBA( 
	DelbaParamSet.field.TID	= pBA->BaParamSet.field.TID;



	skb = dev_alloc_skb(len + sizeof(struct rtllib_hdr_3addr));

	if (skb == NULL)

	{

	if (skb == NULL) {

		RTLLIB_DEBUG(RTLLIB_DL_ERR, "can't alloc skb for ADDBA_REQ\n");

		return NULL;

	}



	skb_reserve(skb, ieee->tx_headroom);



	Delba = ( struct rtllib_hdr_3addr *) skb_put(skb,sizeof( struct rtllib_hdr_3addr));

	Delba = (struct rtllib_hdr_3addr *) skb_put(skb,

		 sizeof(struct rtllib_hdr_3addr));



	memcpy(Delba->addr1, dst, ETH_ALEN);

	memcpy(Delba->addr2, ieee->dev->dev_addr, ETH_ALEN);
@@ -189,11 +188,13 @@ static struct sk_buff* rtllib_DELBA( 


	RTLLIB_DEBUG_DATA(RTLLIB_DL_DATA|RTLLIB_DL_BA, skb->data, skb->len);

	if (net_ratelimit())

	RTLLIB_DEBUG(RTLLIB_DL_TRACE | RTLLIB_DL_BA, "<=====%s()\n", __func__);

		RTLLIB_DEBUG(RTLLIB_DL_TRACE | RTLLIB_DL_BA, "<=====%s()\n",

			     __func__);

	return skb;

}



void rtllib_send_ADDBAReq(struct rtllib_device* ieee, u8*	dst, struct ba_record *pBA)

void rtllib_send_ADDBAReq(struct rtllib_device *ieee, u8 *dst,

			  struct ba_record *pBA)

{

	struct sk_buff *skb = NULL;

	skb = rtllib_ADDBA(ieee, dst, pBA, 0, ACT_ADDBAREQ);
@@ -202,36 +203,36 @@ void rtllib_send_ADDBAReq(struct rtllib_device* ieee, u8* dst, struct ba_record 
		RT_TRACE(COMP_DBG, "====>to send ADDBAREQ!!!!!\n");

		softmac_mgmt_xmit(skb, ieee);

	} else {

		RTLLIB_DEBUG(RTLLIB_DL_ERR, "alloc skb error in function %s()\n", __func__);

		RTLLIB_DEBUG(RTLLIB_DL_ERR, "alloc skb error in function"

			     " %s()\n", __func__);

	}

	return;

}



void rtllib_send_ADDBARsp(struct rtllib_device* ieee, u8* dst, struct ba_record *pBA, u16 StatusCode)

void rtllib_send_ADDBARsp(struct rtllib_device *ieee, u8 *dst,

			  struct ba_record *pBA, u16 StatusCode)

{

	struct sk_buff *skb = NULL;

	skb = rtllib_ADDBA(ieee, dst, pBA, StatusCode, ACT_ADDBARSP);

	if (skb)

		softmac_mgmt_xmit(skb, ieee);

	else

		RTLLIB_DEBUG(RTLLIB_DL_ERR, "alloc skb error in function %s()\n", __func__);



		RTLLIB_DEBUG(RTLLIB_DL_ERR, "alloc skb error in function"

			     " %s()\n", __func__);

	return;



}



void rtllib_send_DELBA(struct rtllib_device* ieee, u8* dst, struct ba_record *pBA, enum tr_select TxRxSelect, u16 ReasonCode)

void rtllib_send_DELBA(struct rtllib_device *ieee, u8 *dst,

		       struct ba_record *pBA, enum tr_select TxRxSelect,

		       u16 ReasonCode)

{

	struct sk_buff *skb = NULL;

	skb = rtllib_DELBA(ieee, dst, pBA, TxRxSelect, ReasonCode);

	if (skb)

	{

		softmac_mgmt_xmit(skb, ieee);

	}

	else

	{

		RTLLIB_DEBUG(RTLLIB_DL_ERR, "alloc skb error in function %s()\n", __func__);

	}

		RTLLIB_DEBUG(RTLLIB_DL_ERR, "alloc skb error in func"

			     "tion %s()\n", __func__);

	return ;

}
@@ -246,9 +247,10 @@ int rtllib_rx_ADDBAReq( struct rtllib_device* ieee, struct sk_buff *skb) 
	union sequence_control *pBaStartSeqCtrl = NULL;

	struct rx_ts_record *pTS = NULL;



	if (skb->len < sizeof( struct rtllib_hdr_3addr) + 9)

	{

		RTLLIB_DEBUG(RTLLIB_DL_ERR, " Invalid skb len in BAREQ(%d / %d)\n",(int)skb->len,	(int)(sizeof( struct rtllib_hdr_3addr) + 9));

	if (skb->len < sizeof(struct rtllib_hdr_3addr) + 9) {

		RTLLIB_DEBUG(RTLLIB_DL_ERR, " Invalid skb len in BAREQ(%d / "

			     "%d)\n", (int)skb->len,

			     (int)(sizeof(struct rtllib_hdr_3addr) + 9));

		return -1;

	}
@@ -268,31 +270,27 @@ int rtllib_rx_ADDBAReq( struct rtllib_device* ieee, struct sk_buff *skb) 
	    (ieee->pHTInfo->bCurrentHTSupport == false) ||

	    (ieee->pHTInfo->IOTAction & HT_IOT_ACT_REJECT_ADDBA_REQ)) {

		rc = ADDBA_STATUS_REFUSED;

		RTLLIB_DEBUG(RTLLIB_DL_ERR, "Failed to reply on ADDBA_REQ as some capability is not ready(%d, %d)\n", ieee->current_network.qos_data.active, ieee->pHTInfo->bCurrentHTSupport);

		RTLLIB_DEBUG(RTLLIB_DL_ERR, "Failed to reply on ADDBA_REQ as "

			     "some capability is not ready(%d, %d)\n",

			     ieee->current_network.qos_data.active,

			     ieee->pHTInfo->bCurrentHTSupport);

		goto OnADDBAReq_Fail;

	}

	if (!GetTs(

			ieee,

			(struct ts_common_info **)(&pTS),

			dst,

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

			RX_DIR,

			true)	)

	{

	if (!GetTs(ieee, (struct ts_common_info **)(&pTS), dst,

	    (u8)(pBaParamSet->field.TID), RX_DIR, true)) {

		rc = ADDBA_STATUS_REFUSED;

		RTLLIB_DEBUG(RTLLIB_DL_ERR, "can't get TS in %s()\n", __func__);

		goto OnADDBAReq_Fail;

	}

	pBA = &pTS->RxAdmittedBARecord;



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

	{

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

		rc = ADDBA_STATUS_INVALID_PARAM;

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

		RTLLIB_DEBUG(RTLLIB_DL_ERR, "BA Policy is not correct in "

			     "%s()\n", __func__);

		goto OnADDBAReq_Fail;

	}





	rtllib_FlushRxTsPendingPkts(ieee, pTS);



	DeActivateBAEntry(ieee, pBA);
@@ -322,7 +320,6 @@ OnADDBAReq_Fail: 
		rtllib_send_ADDBARsp(ieee, dst, &BA, rc);

		return 0;

	}



}



int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb)
@@ -335,9 +332,10 @@ int rtllib_rx_ADDBARsp( struct rtllib_device* ieee, struct sk_buff *skb) 
	union ba_param_set *pBaParamSet = NULL;

	u16			ReasonCode;



	if (skb->len < sizeof( struct rtllib_hdr_3addr) + 9)

	{

		RTLLIB_DEBUG(RTLLIB_DL_ERR, " Invalid skb len in BARSP(%d / %d)\n", (int)skb->len,	(int)(sizeof( struct rtllib_hdr_3addr) + 9));

	if (skb->len < sizeof(struct rtllib_hdr_3addr) + 9) {

		RTLLIB_DEBUG(RTLLIB_DL_ERR, " Invalid skb len in BARSP(%d / "

			     "%d)\n", (int)skb->len,

			     (int)(sizeof(struct rtllib_hdr_3addr) + 9));

		return -1;

	}

	rsp = (struct rtllib_hdr_3addr *)skb->data;
@@ -350,12 +348,14 @@ int rtllib_rx_ADDBARsp( struct rtllib_device* ieee, struct sk_buff *skb) 
	pBaTimeoutVal = (u16 *)(tag + 7);



	RT_TRACE(COMP_DBG, "====>rx ADDBARSP from :"MAC_FMT"\n", MAC_ARG(dst));

	if (

		ieee->current_network.qos_data.active == 0  ||

	if (ieee->current_network.qos_data.active == 0  ||

	    ieee->pHTInfo->bCurrentHTSupport == false ||

		ieee->pHTInfo->bCurrentAMPDUEnable == false )

	{

		RTLLIB_DEBUG(RTLLIB_DL_ERR, "reject to ADDBA_RSP as some capability is not ready(%d, %d, %d)\n",ieee->current_network.qos_data.active, ieee->pHTInfo->bCurrentHTSupport, ieee->pHTInfo->bCurrentAMPDUEnable);

	    ieee->pHTInfo->bCurrentAMPDUEnable == false) {

		RTLLIB_DEBUG(RTLLIB_DL_ERR, "reject to ADDBA_RSP as some capab"

			     "ility is not ready(%d, %d, %d)\n",

			     ieee->current_network.qos_data.active,

			     ieee->pHTInfo->bCurrentHTSupport,

			     ieee->pHTInfo->bCurrentAMPDUEnable);

		ReasonCode = DELBA_REASON_UNKNOWN_BA;

		goto OnADDBARsp_Reject;

	}
@@ -373,28 +373,25 @@ int rtllib_rx_ADDBARsp( struct rtllib_device* ieee, struct sk_buff *skb) 
	pAdmittedBA = &pTS->TxAdmittedBARecord;





	if ((pAdmittedBA->bValid==true))

	{

		RTLLIB_DEBUG(RTLLIB_DL_BA, "OnADDBARsp(): Recv ADDBA Rsp. Drop because already admit it! \n");

	if ((pAdmittedBA->bValid == true)) {

		RTLLIB_DEBUG(RTLLIB_DL_BA, "OnADDBARsp(): Recv ADDBA Rsp."

			     " Drop because already admit it!\n");

		return -1;

	}

	else if ((pPendingBA->bValid == false) ||(*pDialogToken != pPendingBA->DialogToken))

	{

		RTLLIB_DEBUG(RTLLIB_DL_ERR,  "OnADDBARsp(): Recv ADDBA Rsp. BA invalid, DELBA! \n");

	} else if ((pPendingBA->bValid == false) ||

		   (*pDialogToken != pPendingBA->DialogToken)) {

		RTLLIB_DEBUG(RTLLIB_DL_ERR,  "OnADDBARsp(): Recv ADDBA Rsp. "

			     "BA invalid, DELBA!\n");

		ReasonCode = DELBA_REASON_UNKNOWN_BA;

		goto OnADDBARsp_Reject;

	}

	else

	{

		RTLLIB_DEBUG(RTLLIB_DL_BA, "OnADDBARsp(): Recv ADDBA Rsp. BA is admitted! Status code:%X\n", *pStatusCode);

	} else {

		RTLLIB_DEBUG(RTLLIB_DL_BA, "OnADDBARsp(): Recv ADDBA Rsp. BA "

			     "is admitted! Status code:%X\n", *pStatusCode);

		DeActivateBAEntry(ieee, pPendingBA);

	}





	if (*pStatusCode == ADDBA_STATUS_SUCCESS)

	{

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

		{

	if (*pStatusCode == ADDBA_STATUS_SUCCESS) {

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

			pTS->bAddBaReqDelayed = true;

			DeActivateBAEntry(ieee, pAdmittedBA);

			ReasonCode = DELBA_REASON_END_BA;
@@ -424,7 +421,6 @@ OnADDBARsp_Reject: 
		rtllib_send_DELBA(ieee, dst, &BA, TX_DIR, ReasonCode);

		return 0;

	}



}



int rtllib_rx_DELBA(struct rtllib_device *ieee, struct sk_buff *skb)
@@ -434,17 +430,19 @@ int rtllib_rx_DELBA(struct rtllib_device* ieee,struct sk_buff *skb) 
	u16 *pReasonCode = NULL;

	u8 *dst = NULL;



	if (skb->len < sizeof( struct rtllib_hdr_3addr) + 6)

	{

		RTLLIB_DEBUG(RTLLIB_DL_ERR, " Invalid skb len in DELBA(%d / %d)\n", (int)skb->len,	(int)(sizeof( struct rtllib_hdr_3addr) + 6));

	if (skb->len < sizeof(struct rtllib_hdr_3addr) + 6) {

		RTLLIB_DEBUG(RTLLIB_DL_ERR, " Invalid skb len in DELBA(%d /"

			     " %d)\n", (int)skb->len,

			     (int)(sizeof(struct rtllib_hdr_3addr) + 6));

		return -1;

	}



	if (

		ieee->current_network.qos_data.active == 0  ||

		ieee->pHTInfo->bCurrentHTSupport == false )

	{

		RTLLIB_DEBUG(RTLLIB_DL_ERR, "received DELBA while QOS or HT is not supported(%d, %d)\n",ieee->current_network.qos_data.active, ieee->pHTInfo->bCurrentHTSupport);

	if (ieee->current_network.qos_data.active == 0  ||

		ieee->pHTInfo->bCurrentHTSupport == false) {

		RTLLIB_DEBUG(RTLLIB_DL_ERR, "received DELBA while QOS or HT "

			     "is not supported(%d, %d)\n",

			     ieee->current_network. qos_data.active,

			     ieee->pHTInfo->bCurrentHTSupport);

		return -1;

	}
@@ -455,37 +453,26 @@ int rtllib_rx_DELBA(struct rtllib_device* ieee,struct sk_buff *skb) 
	pDelBaParamSet = (union delba_param_set *)(delba+2);

	pReasonCode = (u16 *)(delba+4);



	if (pDelBaParamSet->field.Initiator == 1)

	{

	if (pDelBaParamSet->field.Initiator == 1) {

		struct rx_ts_record *pRxTs;



		if ( !GetTs(

				ieee,

				(struct ts_common_info **)&pRxTs,

				dst,

				(u8)pDelBaParamSet->field.TID,

				RX_DIR,

				false)	)

		{

			RTLLIB_DEBUG(RTLLIB_DL_ERR,  "can't get TS for RXTS in %s().dst:"MAC_FMT" TID:%d\n", __func__, MAC_ARG(dst), (u8)pDelBaParamSet->field.TID);

		if (!GetTs(ieee, (struct ts_common_info **)&pRxTs, dst,

		    (u8)pDelBaParamSet->field.TID, RX_DIR, false)) {

			RTLLIB_DEBUG(RTLLIB_DL_ERR,  "can't get TS for RXTS in "

				     "%s().dst:"MAC_FMT" TID:%d\n", __func__,

				     MAC_ARG(dst),

				     (u8)pDelBaParamSet->field.TID);

			return -1;

		}



		RxTsDeleteBA(ieee, pRxTs);

	}

	else

	{

	} else {

		struct tx_ts_record *pTxTs;



		if (!GetTs(

			ieee,

			(struct ts_common_info **)&pTxTs,

			dst,

			(u8)pDelBaParamSet->field.TID,

			TX_DIR,

			false)	)

		{

			RTLLIB_DEBUG(RTLLIB_DL_ERR,  "can't get TS for TXTS in %s()\n", __func__);

		if (!GetTs(ieee, (struct ts_common_info **)&pTxTs, dst,

			   (u8)pDelBaParamSet->field.TID, TX_DIR, false)) {

			RTLLIB_DEBUG(RTLLIB_DL_ERR,  "can't get TS for TXTS in "

				     "%s()\n", __func__);

			return -1;

		}
@@ -498,13 +485,8 @@ int rtllib_rx_DELBA(struct rtllib_device* ieee,struct sk_buff *skb) 
	return 0;

}



void

TsInitAddBA(

	struct rtllib_device* ieee,

	struct tx_ts_record *pTS,

	u8		Policy,

	u8		bOverwritePending

	)

void TsInitAddBA(struct rtllib_device *ieee, struct tx_ts_record *pTS,

		 u8 Policy, u8	bOverwritePending)

{

	struct ba_record *pBA = &pTS->TxPendingBARecord;
@@ -516,7 +498,8 @@ TsInitAddBA( 
	pBA->DialogToken++;

	pBA->BaParamSet.field.AMSDU_Support = 0;

	pBA->BaParamSet.field.BAPolicy = Policy;

	pBA->BaParamSet.field.TID = pTS->TsCommonInfo.TSpec.f.TSInfo.field.ucTSID;

	pBA->BaParamSet.field.TID =

			 pTS->TsCommonInfo.TSpec.f.TSInfo.field.ucTSID;

	pBA->BaParamSet.field.BufferSize = 32;

	pBA->BaTimeoutValue = 0;

	pBA->BaStartSeqCtrl.field.SeqNum = (pTS->TxCurSeq + 3) % 4096;
@@ -526,34 +509,30 @@ TsInitAddBA( 
	rtllib_send_ADDBAReq(ieee, pTS->TsCommonInfo.Addr, pBA);

}



void

TsInitDelBA( struct rtllib_device* ieee, struct ts_common_info *pTsCommonInfo, enum tr_select TxRxSelect)

{



	if (TxRxSelect == TX_DIR)

void TsInitDelBA(struct rtllib_device *ieee,

		 struct ts_common_info *pTsCommonInfo,

		 enum tr_select TxRxSelect)

{

		struct tx_ts_record *pTxTs = (struct tx_ts_record *)pTsCommonInfo;

	if (TxRxSelect == TX_DIR) {

		struct tx_ts_record *pTxTs =

			 (struct tx_ts_record *)pTsCommonInfo;



		if (TxTsDeleteBA(ieee, pTxTs))

			rtllib_send_DELBA(

				ieee,

				pTsCommonInfo->Addr,

				(pTxTs->TxAdmittedBARecord.bValid)?(&pTxTs->TxAdmittedBARecord):(&pTxTs->TxPendingBARecord),

				TxRxSelect,

				DELBA_REASON_END_BA);

	}

	else if (TxRxSelect == RX_DIR)

	{

		struct rx_ts_record *pRxTs = (struct rx_ts_record *)pTsCommonInfo;

			rtllib_send_DELBA(ieee, pTsCommonInfo->Addr,

					  (pTxTs->TxAdmittedBARecord.bValid) ?

					 (&pTxTs->TxAdmittedBARecord) :

					(&pTxTs->TxPendingBARecord),

					 TxRxSelect, DELBA_REASON_END_BA);

	} else if (TxRxSelect == RX_DIR) {

		struct rx_ts_record *pRxTs =

				 (struct rx_ts_record *)pTsCommonInfo;

		if (RxTsDeleteBA(ieee, pRxTs))

			rtllib_send_DELBA(

				ieee,

				pTsCommonInfo->Addr,

			rtllib_send_DELBA(ieee, pTsCommonInfo->Addr,

					  &pRxTs->RxAdmittedBARecord,

				TxRxSelect,

				DELBA_REASON_END_BA	);

					  TxRxSelect, DELBA_REASON_END_BA);

	}

}



void BaSetupTimeOut(unsigned long data)

{

	struct tx_ts_record *pTxTs = (struct tx_ts_record *)data;
@@ -566,27 +545,23 @@ void BaSetupTimeOut(unsigned long data) 
void TxBaInactTimeout(unsigned long data)

{

	struct tx_ts_record *pTxTs = (struct tx_ts_record *)data;

	struct rtllib_device *ieee = container_of(pTxTs, struct rtllib_device, TxTsRecord[pTxTs->num]);

	struct rtllib_device *ieee = container_of(pTxTs, struct rtllib_device,

				     TxTsRecord[pTxTs->num]);

	TxTsDeleteBA(ieee, pTxTs);

	rtllib_send_DELBA(

		ieee,

		pTxTs->TsCommonInfo.Addr,

		&pTxTs->TxAdmittedBARecord,

		TX_DIR,

	rtllib_send_DELBA(ieee, pTxTs->TsCommonInfo.Addr,

			  &pTxTs->TxAdmittedBARecord, TX_DIR,

			  DELBA_REASON_TIMEOUT);

}



void RxBaInactTimeout(unsigned long data)

{

	struct rx_ts_record *pRxTs = (struct rx_ts_record *)data;

	struct rtllib_device *ieee = container_of(pRxTs, struct rtllib_device, RxTsRecord[pRxTs->num]);

	struct rtllib_device *ieee = container_of(pRxTs, struct rtllib_device,

				     RxTsRecord[pRxTs->num]);



	RxTsDeleteBA(ieee, pRxTs);

	rtllib_send_DELBA(

		ieee,

		pRxTs->TsCommonInfo.Addr,

		&pRxTs->RxAdmittedBARecord,

		RX_DIR,

	rtllib_send_DELBA(ieee, pRxTs->TsCommonInfo.Addr,

			  &pRxTs->RxAdmittedBARecord, RX_DIR,

			  DELBA_REASON_TIMEOUT);

	return ;

}

drivers/staging/rtl8192e/rtl819x_HT.h

+12 −13
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ 


#define HT_SUPPORTED_MCS_1SS_BITMAP			0x000000ff

#define HT_SUPPORTED_MCS_2SS_BITMAP			0x0000ff00

#define HT_SUPPORTED_MCS_1SS_2SS_BITMAP			HT_MCS_1SS_BITMAP|HT_MCS_1SS_2SS_BITMAP



#define HT_SUPPORTED_MCS_1SS_2SS_BITMAP			\

	(HT_MCS_1SS_BITMAP | HT_MCS_1SS_2SS_BITMAP)



enum ht_mcs_rate {

	HT_MCS0   = 0x00000001,
@@ -381,13 +381,12 @@ extern u8 MCS_FILTER_ALL[16]; 
extern u8 MCS_FILTER_1SS[16];



#define PICK_RATE(_nLegacyRate, _nMcsRate)	\

		(_nMcsRate==0)?(_nLegacyRate&0x7f):(_nMcsRate)

		((_nMcsRate == 0) ? (_nLegacyRate&0x7f) : (_nMcsRate))

#define	LEGACY_WIRELESS_MODE	IEEE_MODE_MASK



#define CURRENT_RATE(WirelessMode, LegacyRate, HTRate)	\

			((WirelessMode & (LEGACY_WIRELESS_MODE)) != 0) ? \

						(LegacyRate):\

						(PICK_RATE(LegacyRate, HTRate))

			(LegacyRate) : (PICK_RATE(LegacyRate, HTRate))

drivers/staging/rtl8192e/rtl819x_HTProc.c

+447 −429

File changed.

Preview size limit exceeded, changes collapsed.