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

staging:rtl8192u: Refactor SEQUENCE_CONTROL - Style 



Remove the 'typedef' from union SEQUENCE_CONTROL. This clears a
checkpatch issue with defining new types.

Additionally renamed the union to lowercase to comply with coding
standard.

These are coding style changes which should not impact runtime
code execution.

typedef union _SEQUENCE_CONTROL{
+union sequence_control {

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

drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h

+3 −3
Original line number Diff line number Diff line
@@ -22,13 +22,13 @@ struct ieee80211_ADDBA_Req{ 
} __attribute__ ((packed));

*/

//Is this need?I put here just to make it easier to define structure BA_RECORD //WB

typedef union _SEQUENCE_CONTROL{

union sequence_control {

	u16 ShortData;

	struct {

		u16	FragNum:4;

		u16	SeqNum:12;

	} field;

} SEQUENCE_CONTROL, *PSEQUENCE_CONTROL;

};



typedef union _BA_PARAM_SET {

	u8 charData[2];
@@ -57,7 +57,7 @@ typedef struct _BA_RECORD { 
	u8				DialogToken;

	BA_PARAM_SET		BaParamSet;

	u16				BaTimeoutValue;

	SEQUENCE_CONTROL	BaStartSeqCtrl;

	union sequence_control	BaStartSeqCtrl;

} BA_RECORD, *PBA_RECORD;



#endif //end _BATYPE_H_

drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c

+2 −2
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ int ieee80211_rx_ADDBAReq(struct ieee80211_device *ieee, struct sk_buff *skb) 
	PBA_RECORD pBA = NULL;

	PBA_PARAM_SET	pBaParamSet = NULL;

	u16 *pBaTimeoutVal = NULL;

	PSEQUENCE_CONTROL pBaStartSeqCtrl = NULL;

	union sequence_control *pBaStartSeqCtrl = NULL;

	struct rx_ts_record  *pTS = NULL;



	if (skb->len < sizeof(struct rtl_80211_hdr_3addr) + 9) {
@@ -344,7 +344,7 @@ int ieee80211_rx_ADDBAReq(struct ieee80211_device *ieee, struct sk_buff *skb) 
	pDialogToken = tag + 2;  //category+action

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

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

	pBaStartSeqCtrl = (PSEQUENCE_CONTROL)(req + 7);

	pBaStartSeqCtrl = (union sequence_control *)(req + 7);



	netdev_info(ieee->dev, "====================>rx ADDBAREQ from :%pM\n", dst);

//some other capability is not ready now.