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

staging:rtl8192u: Refactor BA_PARAM_SET - Style 



Refactor the union BA_PARAM_SET, firstly removing the 'typedef', this
clears the checkpatch issue with defining new types. Secondly the union
is renamed to lowercase to comply with the coding standard.

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 198a136f

drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h

+3 −3
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ union sequence_control { 
	} field;

};



typedef union _BA_PARAM_SET {

union ba_param_set {

	u8 charData[2];

	u16 shortData;

	struct {
@@ -39,7 +39,7 @@ typedef union _BA_PARAM_SET { 
		u16 TID:4;

		u16 BufferSize:10;

	} field;

} BA_PARAM_SET, *PBA_PARAM_SET;

};



typedef union _DELBA_PARAM_SET {

	u8 charData[2];
@@ -55,7 +55,7 @@ typedef struct _BA_RECORD { 
	struct timer_list		Timer;

	u8				bValid;

	u8				DialogToken;

	BA_PARAM_SET		BaParamSet;

	union ba_param_set		BaParamSet;

	u16				BaTimeoutValue;

	union sequence_control	BaStartSeqCtrl;

} BA_RECORD, *PBA_RECORD;

drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c

+4 −4
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ int ieee80211_rx_ADDBAReq(struct ieee80211_device *ieee, struct sk_buff *skb) 
	u16 rc = 0;

	u8 *dst = NULL, *pDialogToken = NULL, *tag = NULL;

	PBA_RECORD pBA = NULL;

	PBA_PARAM_SET	pBaParamSet = NULL;

	union ba_param_set     *pBaParamSet = NULL;

	u16 *pBaTimeoutVal = NULL;

	union sequence_control *pBaStartSeqCtrl = NULL;

	struct rx_ts_record  *pTS = NULL;
@@ -342,7 +342,7 @@ int ieee80211_rx_ADDBAReq(struct ieee80211_device *ieee, struct sk_buff *skb) 
	dst = &req->addr2[0];

	tag += sizeof(struct rtl_80211_hdr_3addr);

	pDialogToken = tag + 2;  //category+action

	pBaParamSet = (PBA_PARAM_SET)(tag + 3);   //+DialogToken

	pBaParamSet = (union ba_param_set *)(tag + 3);   //+DialogToken

	pBaTimeoutVal = (u16 *)(tag + 5);

	pBaStartSeqCtrl = (union sequence_control *)(req + 7);
@@ -423,7 +423,7 @@ int ieee80211_rx_ADDBARsp(struct ieee80211_device *ieee, struct sk_buff *skb) 
	struct tx_ts_record     *pTS = NULL;

	u8 *dst = NULL, *pDialogToken = NULL, *tag = NULL;

	u16 *pStatusCode = NULL, *pBaTimeoutVal = NULL;

	PBA_PARAM_SET		pBaParamSet = NULL;

	union ba_param_set       *pBaParamSet = NULL;

	u16			ReasonCode;



	if (skb->len < sizeof(struct rtl_80211_hdr_3addr) + 9) {
@@ -439,7 +439,7 @@ int ieee80211_rx_ADDBARsp(struct ieee80211_device *ieee, struct sk_buff *skb) 
	tag += sizeof(struct rtl_80211_hdr_3addr);

	pDialogToken = tag + 2;

	pStatusCode = (u16 *)(tag + 3);

	pBaParamSet = (PBA_PARAM_SET)(tag + 5);

	pBaParamSet = (union ba_param_set *)(tag + 5);

	pBaTimeoutVal = (u16 *)(tag + 7);



	// Check the capability