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

staging:rtl8192u: Move QOS_TCLAS to rtl819x_TS.h - Style 



Move the union QOS_TCLAS from the header file rtl819x_Qos.h to header
file rtl819x_TS.h, where the structure is actually used, as the member
of another structure.

This is a coding style change, 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 c96dc9b9

drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h

+0 −51
Original line number Diff line number Diff line
@@ -69,57 +69,6 @@ struct tspec_body { 
	u16	medium_time;

};



typedef union _QOS_TCLAS {



	struct _TYPE_GENERAL {

		u8		Priority;

		u8		ClassifierType;

		u8		Mask;

	} TYPE_GENERAL;



	struct _TYPE0_ETH {

		u8		Priority;

		u8		ClassifierType;

		u8		Mask;

		u8		SrcAddr[6];

		u8		DstAddr[6];

		u16		Type;

	} TYPE0_ETH;



	struct _TYPE1_IPV4 {

		u8		Priority;

		u8		ClassifierType;

		u8		Mask;

		u8		Version;

		u8		SrcIP[4];

		u8		DstIP[4];

		u16		SrcPort;

		u16		DstPort;

		u8		DSCP;

		u8		Protocol;

		u8		Reserved;

	} TYPE1_IPV4;



	struct _TYPE1_IPV6 {

		u8		Priority;

		u8		ClassifierType;

		u8		Mask;

		u8		Version;

		u8		SrcIP[16];

		u8		DstIP[16];

		u16		SrcPort;

		u16		DstPort;

		u8		FlowLabel[3];

	} TYPE1_IPV6;



	struct _TYPE2_8021Q {

		u8		Priority;

		u8		ClassifierType;

		u8		Mask;

		u16		TagType;

	} TYPE2_8021Q;

} QOS_TCLAS, *PQOS_TCLAS;



//----------------------------------------------------------------------------

//      802.11 Management frame Status Code field

//----------------------------------------------------------------------------

drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h

+51 −0
Original line number Diff line number Diff line
@@ -14,6 +14,57 @@ enum tr_select { 
	RX_DIR = 1,

};



typedef union _QOS_TCLAS {



	struct _TYPE_GENERAL {

		u8		Priority;

		u8		ClassifierType;

		u8		Mask;

	} TYPE_GENERAL;



	struct _TYPE0_ETH {

		u8		Priority;

		u8		ClassifierType;

		u8		Mask;

		u8		SrcAddr[6];

		u8		DstAddr[6];

		u16		Type;

	} TYPE0_ETH;



	struct _TYPE1_IPV4 {

		u8		Priority;

		u8		ClassifierType;

		u8		Mask;

		u8		Version;

		u8		SrcIP[4];

		u8		DstIP[4];

		u16		SrcPort;

		u16		DstPort;

		u8		DSCP;

		u8		Protocol;

		u8		Reserved;

	} TYPE1_IPV4;



	struct _TYPE1_IPV6 {

		u8		Priority;

		u8		ClassifierType;

		u8		Mask;

		u8		Version;

		u8		SrcIP[16];

		u8		DstIP[16];

		u16		SrcPort;

		u16		DstPort;

		u8		FlowLabel[3];

	} TYPE1_IPV6;



	struct _TYPE2_8021Q {

		u8		Priority;

		u8		ClassifierType;

		u8		Mask;

		u16		TagType;

	} TYPE2_8021Q;

} QOS_TCLAS, *PQOS_TCLAS;



struct ts_common_info {

	struct list_head		list;

	struct timer_list		setup_timer;

CRA Git | Maintained and supported by SUSTech CRA and CCSE