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: John Whitmore <johnfwhitmore@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
index a4b8b57..fb055a8 100644 (file)
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
@@ -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
 //----------------------------------------------------------------------------

diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h
index a9f865f..5cf00a2 100644 (file)
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h
@@ -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;