* [PATCH 01/15] staging:rtl8192u: Remove typedef of u32 to QOS_MODE - Style
2018-07-23 20:50 [PATCH 00/15] Removal of usused definitions - Style John Whitmore
@ 2018-07-23 20:50 ` John Whitmore
2018-07-23 20:50 ` [PATCH 02/15] staging:rtl8192u: Remove unused enumerated type ACK_POLICY " John Whitmore
` (13 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: John Whitmore @ 2018-07-23 20:50 UTC (permalink / raw)
To: linux-kernel; +Cc: devel, gregkh, pombredanne, kstewart, tglx, John Whitmore
The typedef of QOS_MODE as a u32 is contrary to coding standard and fails
the checkpatch tests for defining new types in code. Definitions of type
QOS_MODE have simply been replaced with a u32 type.
This is a coding style change which should not impact runtime execution.
Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>
---
drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
index 96e9621e9887..45ba96a13b13 100644
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
@@ -16,7 +16,6 @@
// QOS_HCCA = 4,
//}QOS_MODE,*PQOS_MODE;
//
-typedef u32 QOS_MODE, *PQOS_MODE;
#define QOS_DISABLE 0
#define QOS_WMM 1
#define QOS_WMMSA 2
@@ -454,8 +453,8 @@ typedef struct _STA_QOS {
u8 *WMMIE;
// Part 1. Self QoS Mode.
- QOS_MODE QosCapability; //QoS Capability, 2006-06-14 Isaiah
- QOS_MODE CurrentQosMode;
+ u32 QosCapability; // QOS_MODE QoS Capability, 2006-06-14 Isaiah
+ u32 CurrentQosMode; // QOS_MODE
// For WMM Power Save Mode :
// ACs are trigger/delivery enabled or legacy power save enabled. 2006-06-13 Isaiah
@@ -502,7 +501,7 @@ typedef struct _STA_QOS {
// Ref: BssDscr in 8185 code. [def. in BssDscr.h]
//
typedef struct _BSS_QOS {
- QOS_MODE bdQoSMode;
+ u32 bdQoSMode; // QOS_MODE
u8 bdWMMIEBuf[MAX_WMMELE_LENGTH];
u8 *bdWMMIE;
--
2.18.0
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 02/15] staging:rtl8192u: Remove unused enumerated type ACK_POLICY - Style
2018-07-23 20:50 [PATCH 00/15] Removal of usused definitions - Style John Whitmore
2018-07-23 20:50 ` [PATCH 01/15] staging:rtl8192u: Remove typedef of u32 to QOS_MODE " John Whitmore
@ 2018-07-23 20:50 ` John Whitmore
2018-07-23 20:50 ` [PATCH 03/15] staging:rtl8192u: Remove unused QOS definitions " John Whitmore
` (12 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: John Whitmore @ 2018-07-23 20:50 UTC (permalink / raw)
To: linux-kernel; +Cc: devel, gregkh, pombredanne, kstewart, tglx, John Whitmore
The enumerated type ACK_POLICY is not used in code so it has been removed
from the source code. This is a coding style change and should have no
impact on runtime code execution.
Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>
---
drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
index 45ba96a13b13..fb2745da5844 100644
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
@@ -26,15 +26,6 @@
#define AC_PARAM_SIZE 4
#define WMM_PARAM_ELE_BODY_LEN 18
-//
-// QoS ACK Policy Field Values
-// Ref: WMM spec 2.1.6: QoS Control Field, p.10.
-//
-typedef enum _ACK_POLICY {
- eAckPlc0_ACK = 0x00,
- eAckPlc1_NoACK = 0x01,
-} ACK_POLICY, *PACK_POLICY;
-
#define WMM_PARAM_ELEMENT_SIZE (8+(4*AC_PARAM_SIZE))
//
--
2.18.0
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 03/15] staging:rtl8192u: Remove unused QOS definitions - Style
2018-07-23 20:50 [PATCH 00/15] Removal of usused definitions - Style John Whitmore
2018-07-23 20:50 ` [PATCH 01/15] staging:rtl8192u: Remove typedef of u32 to QOS_MODE " John Whitmore
2018-07-23 20:50 ` [PATCH 02/15] staging:rtl8192u: Remove unused enumerated type ACK_POLICY " John Whitmore
@ 2018-07-23 20:50 ` John Whitmore
2018-07-23 20:50 ` [PATCH 04/15] staging:rtl8192u: Removed unused structure BSS_QOS " John Whitmore
` (11 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: John Whitmore @ 2018-07-23 20:50 UTC (permalink / raw)
To: linux-kernel; +Cc: devel, gregkh, pombredanne, kstewart, tglx, John Whitmore
Remove the unused QOS related types.
Since definitions are not used simply remove from code. This change is
a coding style change and should not impact runtime execution.
Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>
---
.../staging/rtl8192u/ieee80211/rtl819x_Qos.h | 22 -------------------
1 file changed, 22 deletions(-)
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
index fb2745da5844..a83abaf3a2ea 100644
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
@@ -4,25 +4,6 @@
#define MAX_WMMELE_LENGTH 64
-//
-// QoS mode.
-// enum 0, 1, 2, 4: since we can use the OR(|) operation.
-//
-// QOS_MODE is redefined for enum can't be ++, | under C++ compiler, 2006.05.17, by rcnjko.
-//typedef enum _QOS_MODE{
-// QOS_DISABLE = 0,
-// QOS_WMM = 1,
-// QOS_EDCA = 2,
-// QOS_HCCA = 4,
-//}QOS_MODE,*PQOS_MODE;
-//
-#define QOS_DISABLE 0
-#define QOS_WMM 1
-#define QOS_WMMSA 2
-#define QOS_EDCA 4
-#define QOS_HCCA 8
-#define QOS_WMM_UAPSD 16 //WMM Power Save, 2006-06-14 Isaiah
-
#define AC_PARAM_SIZE 4
#define WMM_PARAM_ELE_BODY_LEN 18
@@ -506,14 +487,11 @@ typedef struct _BSS_QOS {
AC_PARAM AcParameter[4];
} BSS_QOS, *PBSS_QOS;
-
//
// Ref: sQoSCtlLng and QoSCtl definition in 8185 QoS code.
//#define QoSCtl (( (Adapter->bRegQoS) && (Adapter->dot11QoS.QoSMode &(QOS_EDCA|QOS_HCCA)) ) ?sQoSCtlLng:0)
//
#define sQoSCtlLng 2
-#define QOS_CTRL_LEN(_QosMode) ((_QosMode > QOS_DISABLE) ? sQoSCtlLng : 0)
-
//Added by joseph
//UP Mapping to AC, using in MgntQuery_SequenceNumber() and maybe for DSCP
--
2.18.0
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 04/15] staging:rtl8192u: Removed unused structure BSS_QOS - Style
2018-07-23 20:50 [PATCH 00/15] Removal of usused definitions - Style John Whitmore
` (2 preceding siblings ...)
2018-07-23 20:50 ` [PATCH 03/15] staging:rtl8192u: Remove unused QOS definitions " John Whitmore
@ 2018-07-23 20:50 ` John Whitmore
2018-07-23 20:50 ` [PATCH 05/15] staging:rtl8192u: Remove unused structure STA_QOS " John Whitmore
` (10 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: John Whitmore @ 2018-07-23 20:50 UTC (permalink / raw)
To: linux-kernel; +Cc: devel, gregkh, pombredanne, kstewart, tglx, John Whitmore
The structure BSS_QOS is not used in code so has simply been removed. The
change is a coding style change and should not impact runtime execution.
Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>
---
.../staging/rtl8192u/ieee80211/rtl819x_Qos.h | 19 -------------------
1 file changed, 19 deletions(-)
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
index a83abaf3a2ea..d202244b8cac 100644
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
@@ -468,25 +468,6 @@ typedef struct _STA_QOS {
} STA_QOS, *PSTA_QOS;
-//
-// BSS QOS data.
-// Ref: BssDscr in 8185 code. [def. in BssDscr.h]
-//
-typedef struct _BSS_QOS {
- u32 bdQoSMode; // QOS_MODE
-
- u8 bdWMMIEBuf[MAX_WMMELE_LENGTH];
- u8 *bdWMMIE;
-
- QOS_ELE_SUBTYPE EleSubType;
-
- u8 *pWMMInfoEle;
- u8 *pWMMParamEle;
-
- QOS_INFO_FIELD QosInfoField;
- AC_PARAM AcParameter[4];
-} BSS_QOS, *PBSS_QOS;
-
//
// Ref: sQoSCtlLng and QoSCtl definition in 8185 QoS code.
//#define QoSCtl (( (Adapter->bRegQoS) && (Adapter->dot11QoS.QoSMode &(QOS_EDCA|QOS_HCCA)) ) ?sQoSCtlLng:0)
--
2.18.0
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 05/15] staging:rtl8192u: Remove unused structure STA_QOS - Style
2018-07-23 20:50 [PATCH 00/15] Removal of usused definitions - Style John Whitmore
` (3 preceding siblings ...)
2018-07-23 20:50 ` [PATCH 04/15] staging:rtl8192u: Removed unused structure BSS_QOS " John Whitmore
@ 2018-07-23 20:50 ` John Whitmore
2018-07-23 20:50 ` [PATCH 06/15] staging:rtl8192u: Remove unused structure QOS_CTRL_FIELD " John Whitmore
` (9 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: John Whitmore @ 2018-07-23 20:50 UTC (permalink / raw)
To: linux-kernel; +Cc: devel, gregkh, pombredanne, kstewart, tglx, John Whitmore
Remove structure STA_QOS as it is unused in code. This change is a coding
style change so should not impact runtime code execution.
Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>
---
.../staging/rtl8192u/ieee80211/rtl819x_Qos.h | 53 -------------------
1 file changed, 53 deletions(-)
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
index d202244b8cac..da74d4a29ed2 100644
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
@@ -415,59 +415,6 @@ typedef struct _OCTET_STRING {
u16 Length;
} OCTET_STRING, *POCTET_STRING;
-//
-// STA QoS data.
-// Ref: DOT11_QOS in 8185 code. [def. in QoS_mp.h]
-//
-typedef struct _STA_QOS {
- //DECLARE_RT_OBJECT(STA_QOS);
- u8 WMMIEBuf[MAX_WMMELE_LENGTH];
- u8 *WMMIE;
-
- // Part 1. Self QoS Mode.
- u32 QosCapability; // QOS_MODE QoS Capability, 2006-06-14 Isaiah
- u32 CurrentQosMode; // QOS_MODE
-
- // For WMM Power Save Mode :
- // ACs are trigger/delivery enabled or legacy power save enabled. 2006-06-13 Isaiah
- AC_UAPSD b4ac_Uapsd; //VoUapsd(bit0), ViUapsd(bit1), BkUapsd(bit2), BeUapsd(bit3),
- AC_UAPSD Curr4acUapsd;
- u8 bInServicePeriod;
- u8 MaxSPLength;
- int NumBcnBeforeTrigger;
-
- // Part 2. EDCA Parameter (perAC)
- u8 *pWMMInfoEle;
- u8 WMMParamEle[WMM_PARAM_ELEMENT_SIZE];
- u8 WMMPELength;
-
- // <Bruce_Note>
- //2 ToDo: remove the Qos Info Field and replace it by the above WMM Info element.
- // By Bruce, 2008-01-30.
- // Part 2. EDCA Parameter (perAC)
- QOS_INFO_FIELD QosInfoField_STA; // Maintained by STA
- QOS_INFO_FIELD QosInfoField_AP; // Retrieved from AP
-
- AC_PARAM CurAcParameters[4];
-
- // Part 3. ACM
- ACM acm[4];
- ACM_METHOD AcmMethod;
-
- // Part 4. Per TID (Part 5: TCLASS will be described by TStream)
- QOS_TSTREAM TStream[16];
- WMM_TSPEC TSpec;
-
- u32 QBssWirelessMode;
-
- // No Ack Setting
- u8 bNoAck;
-
- // Enable/Disable Rx immediate BA capability.
- u8 bEnableRxImmBA;
-
-} STA_QOS, *PSTA_QOS;
-
//
// Ref: sQoSCtlLng and QoSCtl definition in 8185 QoS code.
//#define QoSCtl (( (Adapter->bRegQoS) && (Adapter->dot11QoS.QoSMode &(QOS_EDCA|QOS_HCCA)) ) ?sQoSCtlLng:0)
--
2.18.0
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 06/15] staging:rtl8192u: Remove unused structure QOS_CTRL_FIELD - Style
2018-07-23 20:50 [PATCH 00/15] Removal of usused definitions - Style John Whitmore
` (4 preceding siblings ...)
2018-07-23 20:50 ` [PATCH 05/15] staging:rtl8192u: Remove unused structure STA_QOS " John Whitmore
@ 2018-07-23 20:50 ` John Whitmore
2018-07-23 20:50 ` [PATCH 07/15] staging:rtl8192u: Remove unused union QOS_INFO_FIELD " John Whitmore
` (8 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: John Whitmore @ 2018-07-23 20:50 UTC (permalink / raw)
To: linux-kernel; +Cc: devel, gregkh, pombredanne, kstewart, tglx, John Whitmore
The structure QOS_CTRL_FIELD is unused in code so has simply been removed
from source. This is a coding style change and should have no impact
on runtime code execution.
Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>
---
.../staging/rtl8192u/ieee80211/rtl819x_Qos.h | 50 -------------------
1 file changed, 50 deletions(-)
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
index da74d4a29ed2..90f5939c9ecc 100644
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
@@ -9,56 +9,6 @@
#define WMM_PARAM_ELEMENT_SIZE (8+(4*AC_PARAM_SIZE))
-//
-// QoS Control Field
-// Ref:
-// 1. WMM spec 2.1.6: QoS Control Field, p.9.
-// 2. 802.11e/D13.0 7.1.3.5, p.26.
-//
-typedef union _QOS_CTRL_FIELD {
- u8 charData[2];
- u16 shortData;
-
- // WMM spec
- struct {
- u8 UP:3;
- u8 usRsvd1:1;
- u8 EOSP:1;
- u8 AckPolicy:2;
- u8 usRsvd2:1;
- u8 ucRsvdByte;
- } WMM;
-
- // 802.11e: QoS data type frame sent by non-AP QSTAs.
- struct {
- u8 TID:4;
- u8 bIsQsize:1;// 0: BIT[8:15] is TXOP Duration Requested, 1: BIT[8:15] is Queue Size.
- u8 AckPolicy:2;
- u8 usRsvd:1;
- u8 TxopOrQsize; // (BIT4=0)TXOP Duration Requested or (BIT4=1)Queue Size.
- } BySta;
-
- // 802.11e: QoS data, QoS Null, and QoS Data+CF-Ack frames sent by HC.
- struct {
- u8 TID:4;
- u8 EOSP:1;
- u8 AckPolicy:2;
- u8 usRsvd:1;
- u8 PSBufState; // QAP PS Buffer State.
- } ByHc_Data;
-
- // 802.11e: QoS (+) CF-Poll frames sent by HC.
- struct {
- u8 TID:4;
- u8 EOSP:1;
- u8 AckPolicy:2;
- u8 usRsvd:1;
- u8 TxopLimit; // TXOP Limit.
- } ByHc_CFP;
-
-} QOS_CTRL_FIELD, *PQOS_CTRL_FIELD;
-
-
//
// QoS Info Field
// Ref:
--
2.18.0
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 07/15] staging:rtl8192u: Remove unused union QOS_INFO_FIELD - Style
2018-07-23 20:50 [PATCH 00/15] Removal of usused definitions - Style John Whitmore
` (5 preceding siblings ...)
2018-07-23 20:50 ` [PATCH 06/15] staging:rtl8192u: Remove unused structure QOS_CTRL_FIELD " John Whitmore
@ 2018-07-23 20:50 ` John Whitmore
2018-07-23 20:50 ` [PATCH 08/15] staging:rtl8192u: Remove the unused AC_CODING definitions " John Whitmore
` (7 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: John Whitmore @ 2018-07-23 20:50 UTC (permalink / raw)
To: linux-kernel; +Cc: devel, gregkh, pombredanne, kstewart, tglx, John Whitmore
The union QOS_INFO_FIELD is unused in code so has been removed from source.
This change is a coding style change so should have no impact on runtime
code execution.
Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>
---
.../staging/rtl8192u/ieee80211/rtl819x_Qos.h | 86 -------------------
1 file changed, 86 deletions(-)
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
index 90f5939c9ecc..e0c51c5c6816 100644
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
@@ -9,92 +9,6 @@
#define WMM_PARAM_ELEMENT_SIZE (8+(4*AC_PARAM_SIZE))
-//
-// QoS Info Field
-// Ref:
-// 1. WMM spec 2.2.1: WME Information Element, p.11.
-// 2. 8185 QoS code: QOS_INFO [def. in QoS_mp.h]
-//
-typedef union _QOS_INFO_FIELD {
- u8 charData;
-
- struct {
- u8 ucParameterSetCount:4;
- u8 ucReserved:4;
- } WMM;
-
- struct {
- //Ref WMM_Specification_1-1.pdf, 2006-06-13 Isaiah
- u8 ucAC_VO_UAPSD:1;
- u8 ucAC_VI_UAPSD:1;
- u8 ucAC_BE_UAPSD:1;
- u8 ucAC_BK_UAPSD:1;
- u8 ucReserved1:1;
- u8 ucMaxSPLen:2;
- u8 ucReserved2:1;
-
- } ByWmmPsSta;
-
- struct {
- //Ref WMM_Specification_1-1.pdf, 2006-06-13 Isaiah
- u8 ucParameterSetCount:4;
- u8 ucReserved:3;
- u8 ucApUapsd:1;
- } ByWmmPsAp;
-
- struct {
- u8 ucAC3_UAPSD:1;
- u8 ucAC2_UAPSD:1;
- u8 ucAC1_UAPSD:1;
- u8 ucAC0_UAPSD:1;
- u8 ucQAck:1;
- u8 ucMaxSPLen:2;
- u8 ucMoreDataAck:1;
- } By11eSta;
-
- struct {
- u8 ucParameterSetCount:4;
- u8 ucQAck:1;
- u8 ucQueueReq:1;
- u8 ucTXOPReq:1;
- u8 ucReserved:1;
- } By11eAp;
-
- struct {
- u8 ucReserved1:4;
- u8 ucQAck:1;
- u8 ucReserved2:2;
- u8 ucMoreDataAck:1;
- } ByWmmsaSta;
-
- struct {
- u8 ucReserved1:4;
- u8 ucQAck:1;
- u8 ucQueueReq:1;
- u8 ucTXOPReq:1;
- u8 ucReserved2:1;
- } ByWmmsaAp;
-
- struct {
- u8 ucAC3_UAPSD:1;
- u8 ucAC2_UAPSD:1;
- u8 ucAC1_UAPSD:1;
- u8 ucAC0_UAPSD:1;
- u8 ucQAck:1;
- u8 ucMaxSPLen:2;
- u8 ucMoreDataAck:1;
- } ByAllSta;
-
- struct {
- u8 ucParameterSetCount:4;
- u8 ucQAck:1;
- u8 ucQueueReq:1;
- u8 ucTXOPReq:1;
- u8 ucApUapsd:1;
- } ByAllAp;
-
-} QOS_INFO_FIELD, *PQOS_INFO_FIELD;
-
//
// ACI to AC coding.
// Ref: WMM spec 2.2.2: WME Parameter Element, p.13.
--
2.18.0
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 08/15] staging:rtl8192u: Remove the unused AC_CODING definitions - Style
2018-07-23 20:50 [PATCH 00/15] Removal of usused definitions - Style John Whitmore
` (6 preceding siblings ...)
2018-07-23 20:50 ` [PATCH 07/15] staging:rtl8192u: Remove unused union QOS_INFO_FIELD " John Whitmore
@ 2018-07-23 20:50 ` John Whitmore
2018-07-23 20:50 ` [PATCH 09/15] staging:rtl8192u: Remove unused enumerated type QOS_ELE_SUBTYPE " John Whitmore
` (6 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: John Whitmore @ 2018-07-23 20:50 UTC (permalink / raw)
To: linux-kernel; +Cc: devel, gregkh, pombredanne, kstewart, tglx, John Whitmore
The AC_CODING definitions are unused in code, so have simply been removed
from source. This is a coding style change and should not impact runtime
code execution.
Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>
---
.../staging/rtl8192u/ieee80211/rtl819x_Qos.h | 20 -------------------
1 file changed, 20 deletions(-)
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
index e0c51c5c6816..455b87edc7fb 100644
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
@@ -9,26 +9,6 @@
#define WMM_PARAM_ELEMENT_SIZE (8+(4*AC_PARAM_SIZE))
-//
-// ACI to AC coding.
-// Ref: WMM spec 2.2.2: WME Parameter Element, p.13.
-//
-// AC_CODING is redefined for enum can't be ++, | under C++ compiler, 2006.05.17, by rcnjko.
-//typedef enum _AC_CODING{
-// AC0_BE = 0, // ACI: 0x00 // Best Effort
-// AC1_BK = 1, // ACI: 0x01 // Background
-// AC2_VI = 2, // ACI: 0x10 // Video
-// AC3_VO = 3, // ACI: 0x11 // Voice
-// AC_MAX = 4, // Max: define total number; Should not to be used as a real enum.
-//}AC_CODING,*PAC_CODING;
-//
-typedef u32 AC_CODING;
-#define AC0_BE 0 // ACI: 0x00 // Best Effort
-#define AC1_BK 1 // ACI: 0x01 // Background
-#define AC2_VI 2 // ACI: 0x10 // Video
-#define AC3_VO 3 // ACI: 0x11 // Voice
-#define AC_MAX 4 // Max: define total number; Should not to be used as a real enum.
-
//
// ACI/AIFSN Field.
// Ref: WMM spec 2.2.2: WME Parameter Element, p.12.
--
2.18.0
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 09/15] staging:rtl8192u: Remove unused enumerated type QOS_ELE_SUBTYPE - Style
2018-07-23 20:50 [PATCH 00/15] Removal of usused definitions - Style John Whitmore
` (7 preceding siblings ...)
2018-07-23 20:50 ` [PATCH 08/15] staging:rtl8192u: Remove the unused AC_CODING definitions " John Whitmore
@ 2018-07-23 20:50 ` John Whitmore
2018-07-23 20:50 ` [PATCH 10/15] staging:rtl8192u: Remove unused structure QOS_TSTREAM " John Whitmore
` (5 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: John Whitmore @ 2018-07-23 20:50 UTC (permalink / raw)
To: linux-kernel; +Cc: devel, gregkh, pombredanne, kstewart, tglx, John Whitmore
The enumerated type QOS_ELE_SUBTYPE is unused in code so has been removed
from code. This is a coding style change which should have not impact on
runtime code execution.
Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>
---
drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
index 455b87edc7fb..6cfae00919c1 100644
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
@@ -51,17 +51,6 @@ typedef union _AC_PARAM {
} f; // Field
} AC_PARAM, *PAC_PARAM;
-
-
-//
-// QoS element subtype
-//
-typedef enum _QOS_ELE_SUBTYPE {
- QOSELE_TYPE_INFO = 0x00, // 0x00: Information element
- QOSELE_TYPE_PARAM = 0x01, // 0x01: parameter element
-} QOS_ELE_SUBTYPE, *PQOS_ELE_SUBTYPE;
-
-
//
// Direction Field Values.
// Ref: WMM spec 2.2.11: WME TSPEC Element, p.18.
--
2.18.0
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 10/15] staging:rtl8192u: Remove unused structure QOS_TSTREAM - Style
2018-07-23 20:50 [PATCH 00/15] Removal of usused definitions - Style John Whitmore
` (8 preceding siblings ...)
2018-07-23 20:50 ` [PATCH 09/15] staging:rtl8192u: Remove unused enumerated type QOS_ELE_SUBTYPE " John Whitmore
@ 2018-07-23 20:50 ` John Whitmore
2018-07-23 20:50 ` [PATCH 11/15] staging:rtl8192u: Remove unused structure WMM_TSPEC " John Whitmore
` (4 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: John Whitmore @ 2018-07-23 20:50 UTC (permalink / raw)
To: linux-kernel; +Cc: devel, gregkh, pombredanne, kstewart, tglx, John Whitmore
The structure QOS_TSTREAM is unused in code so has simply been removed.
This change is a coding style change and should have no impact on runtime
code execution.
Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>
---
drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
index 6cfae00919c1..7028c9ae888a 100644
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
@@ -214,17 +214,6 @@ typedef union _QOS_TCLAS {
} TYPE2_8021Q;
} QOS_TCLAS, *PQOS_TCLAS;
-//typedef struct _WMM_TSTREAM{
-//
-//- TSPEC
-//- AC (which to mapping)
-//} WMM_TSTREAM, *PWMM_TSTREAM;
-typedef struct _QOS_TSTREAM {
- u8 AC;
- WMM_TSPEC TSpec;
- QOS_TCLAS TClass;
-} QOS_TSTREAM, *PQOS_TSTREAM;
-
//typedef struct _U_APSD{
//- TriggerEnable [4]
//- MaxSPLength
--
2.18.0
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 11/15] staging:rtl8192u: Remove unused structure WMM_TSPEC - Style
2018-07-23 20:50 [PATCH 00/15] Removal of usused definitions - Style John Whitmore
` (9 preceding siblings ...)
2018-07-23 20:50 ` [PATCH 10/15] staging:rtl8192u: Remove unused structure QOS_TSTREAM " John Whitmore
@ 2018-07-23 20:50 ` John Whitmore
2018-07-23 20:50 ` [PATCH 12/15] staging:rtl8192u: Remove unused enumerated type ACM_METHOD " John Whitmore
` (3 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: John Whitmore @ 2018-07-23 20:50 UTC (permalink / raw)
To: linux-kernel; +Cc: devel, gregkh, pombredanne, kstewart, tglx, John Whitmore
Remove the structure WMM_TSPEC as it is unused. This change is a coding
style change and should not impact runtime code execution.
Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>
---
drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
index 7028c9ae888a..58101d1ff2b8 100644
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
@@ -112,21 +112,6 @@ typedef union _TSPEC_BODY {
} f; // Field
} TSPEC_BODY, *PTSPEC_BODY;
-
-//
-// WMM TSPEC Element.
-// Ref: WMM spec 2.2.11: WME TSPEC Element, p.16.
-//
-typedef struct _WMM_TSPEC {
- u8 ID;
- u8 Length;
- u8 OUI[3];
- u8 OUI_Type;
- u8 OUI_SubType;
- u8 Version;
- TSPEC_BODY Body;
-} WMM_TSPEC, *PWMM_TSPEC;
-
//
// ACM implementation method.
// Annie, 2005-12-13.
--
2.18.0
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 12/15] staging:rtl8192u: Remove unused enumerated type ACM_METHOD - Style
2018-07-23 20:50 [PATCH 00/15] Removal of usused definitions - Style John Whitmore
` (10 preceding siblings ...)
2018-07-23 20:50 ` [PATCH 11/15] staging:rtl8192u: Remove unused structure WMM_TSPEC " John Whitmore
@ 2018-07-23 20:50 ` John Whitmore
2018-07-23 20:50 ` [PATCH 13/15] staging:rtl8192u: Remove unused structure ACM " John Whitmore
` (2 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: John Whitmore @ 2018-07-23 20:50 UTC (permalink / raw)
To: linux-kernel; +Cc: devel, gregkh, pombredanne, kstewart, tglx, John Whitmore
Remove the enumerated type ACM_METHOD as it is unused in code. This is
a coding style change and should not impact runtime code execution.
Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>
---
drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
index 58101d1ff2b8..49d9184f22ec 100644
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
@@ -112,17 +112,6 @@ typedef union _TSPEC_BODY {
} f; // Field
} TSPEC_BODY, *PTSPEC_BODY;
-//
-// ACM implementation method.
-// Annie, 2005-12-13.
-//
-typedef enum _ACM_METHOD {
- eAcmWay0_SwAndHw = 0, // By SW and HW.
- eAcmWay1_HW = 1, // By HW.
- eAcmWay2_SW = 2, // By SW.
-} ACM_METHOD, *PACM_METHOD;
-
-
typedef struct _ACM {
// u8 RegEnableACM;
u64 UsedTime;
--
2.18.0
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 13/15] staging:rtl8192u: Remove unused structure ACM - Style
2018-07-23 20:50 [PATCH 00/15] Removal of usused definitions - Style John Whitmore
` (11 preceding siblings ...)
2018-07-23 20:50 ` [PATCH 12/15] staging:rtl8192u: Remove unused enumerated type ACM_METHOD " John Whitmore
@ 2018-07-23 20:50 ` John Whitmore
2018-07-23 20:50 ` [PATCH 14/15] staging:rtl8192u: Remove unused AC_UAPSD definitions " John Whitmore
2018-07-23 20:50 ` [PATCH 15/15] staging:rtl8192u: Remove unused definition of sQoSCtlLng " John Whitmore
14 siblings, 0 replies; 16+ messages in thread
From: John Whitmore @ 2018-07-23 20:50 UTC (permalink / raw)
To: linux-kernel; +Cc: devel, gregkh, pombredanne, kstewart, tglx, John Whitmore
Remove the structure ACM as it is unused in code. This change is a coding
style change and should have no impact on runtime code execution.
Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>
---
drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h | 7 -------
1 file changed, 7 deletions(-)
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
index 49d9184f22ec..878c467e7b89 100644
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
@@ -112,13 +112,6 @@ typedef union _TSPEC_BODY {
} f; // Field
} TSPEC_BODY, *PTSPEC_BODY;
-typedef struct _ACM {
-// u8 RegEnableACM;
- u64 UsedTime;
- u64 MediumTime;
- u8 HwAcmCtl; // TRUE: UsedTime exceed => Do NOT USE this AC. It wll be written to ACM_CONTROL(0xBF BIT 0/1/2 in 8185B).
-} ACM, *PACM;
-
typedef u8 AC_UAPSD, *PAC_UAPSD;
#define GET_VO_UAPSD(_apsd) ((_apsd) & BIT(0))
--
2.18.0
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 14/15] staging:rtl8192u: Remove unused AC_UAPSD definitions - Style
2018-07-23 20:50 [PATCH 00/15] Removal of usused definitions - Style John Whitmore
` (12 preceding siblings ...)
2018-07-23 20:50 ` [PATCH 13/15] staging:rtl8192u: Remove unused structure ACM " John Whitmore
@ 2018-07-23 20:50 ` John Whitmore
2018-07-23 20:50 ` [PATCH 15/15] staging:rtl8192u: Remove unused definition of sQoSCtlLng " John Whitmore
14 siblings, 0 replies; 16+ messages in thread
From: John Whitmore @ 2018-07-23 20:50 UTC (permalink / raw)
To: linux-kernel; +Cc: devel, gregkh, pombredanne, kstewart, tglx, John Whitmore
Remove the definitions associated with AC_UAPSD. These definitions are
not used in code so have simply been removed. This is a coding style
change and should have no impact on runtime execution.
Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>
---
drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
index 878c467e7b89..471874dd8cb5 100644
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
@@ -112,21 +112,6 @@ typedef union _TSPEC_BODY {
} f; // Field
} TSPEC_BODY, *PTSPEC_BODY;
-typedef u8 AC_UAPSD, *PAC_UAPSD;
-
-#define GET_VO_UAPSD(_apsd) ((_apsd) & BIT(0))
-#define SET_VO_UAPSD(_apsd) ((_apsd) |= BIT(0))
-
-#define GET_VI_UAPSD(_apsd) ((_apsd) & BIT(1))
-#define SET_VI_UAPSD(_apsd) ((_apsd) |= BIT(1))
-
-#define GET_BK_UAPSD(_apsd) ((_apsd) & BIT(2))
-#define SET_BK_UAPSD(_apsd) ((_apsd) |= BIT(2))
-
-#define GET_BE_UAPSD(_apsd) ((_apsd) & BIT(3))
-#define SET_BE_UAPSD(_apsd) ((_apsd) |= BIT(3))
-
-
//typedef struct _TCLASS{
// TODO
//} TCLASS, *PTCLASS;
--
2.18.0
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 15/15] staging:rtl8192u: Remove unused definition of sQoSCtlLng - Style
2018-07-23 20:50 [PATCH 00/15] Removal of usused definitions - Style John Whitmore
` (13 preceding siblings ...)
2018-07-23 20:50 ` [PATCH 14/15] staging:rtl8192u: Remove unused AC_UAPSD definitions " John Whitmore
@ 2018-07-23 20:50 ` John Whitmore
14 siblings, 0 replies; 16+ messages in thread
From: John Whitmore @ 2018-07-23 20:50 UTC (permalink / raw)
To: linux-kernel; +Cc: devel, gregkh, pombredanne, kstewart, tglx, John Whitmore
Remove sQoSCtlLng. The constant sQoSCtlLng is never used in code so has
been removed. This is a coding style change so should have no impact on
runtime code execution.
Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>
---
drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h | 6 ------
1 file changed, 6 deletions(-)
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
index 471874dd8cb5..8ee9370520f3 100644
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
@@ -189,12 +189,6 @@ typedef struct _OCTET_STRING {
u16 Length;
} OCTET_STRING, *POCTET_STRING;
-//
-// Ref: sQoSCtlLng and QoSCtl definition in 8185 QoS code.
-//#define QoSCtl (( (Adapter->bRegQoS) && (Adapter->dot11QoS.QoSMode &(QOS_EDCA|QOS_HCCA)) ) ?sQoSCtlLng:0)
-//
-#define sQoSCtlLng 2
-
//Added by joseph
//UP Mapping to AC, using in MgntQuery_SequenceNumber() and maybe for DSCP
//#define UP2AC(up) ((up<3)?((up==0)?1:0):(up>>1))
--
2.18.0
^ permalink raw reply related [flat|nested] 16+ messages in thread