staging:rtl8192u: Coding Style changes

PATCH New John Whitmore 1 participant 11 messages Aug 17, 2018 Staging

lore

Share & tools

lore

John Whitmore

author

2018-08-17 18:34 UTC #0 lore raw

cover staging:rtl8192u: Coding Style changes

A few coding style changes in the file rtl819x_HT.h

John Whitmore (10):
staging:rtl8192u: Replace magic number with defined constant - Style staging:rtl8192u: Rename sHTCLng - Style staging:rtl8192u: Remove unnecessary blank lines - Style staging:rtl8192u: Add required spaces - Style staging:rtl8192u: Remove unused constants - Style staging:rtl8192u: Correct block comments - Style staging:rtl8192u: Remove unused CHHLOP_IN_PROGRESS - Style staging:rtl8192u: Removed commented out structure - Style staging:rtl8192u: Remove enum CHNLOP - Style staging:rtl8192u: Refactor struct HT_CAPABILITY_ELE - Style

 .../staging/rtl8192u/ieee80211/ieee80211_rx.c |   2 +-
 .../staging/rtl8192u/ieee80211/ieee80211_wx.c |   6 +-
 .../staging/rtl8192u/ieee80211/rtl819x_HT.h   | 161 ++++++------------
 .../rtl8192u/ieee80211/rtl819x_HTProc.c       |  37 ++--
 drivers/staging/rtl8192u/r8192U_core.c        |   2 +-
 5 files changed, 73 insertions(+), 135 deletions(-)

Signature · 1 line

2.18.0

John Whitmore

author

2018-08-17 18:35 UTC #1 lore raw

PATCH 1/10 staging:rtl8192u: Replace magic number with defined constant - Style

The defined constant MIMO_PS_STATIC is used for this test for zero elsewhere in code so the magic number '0' has been replaced with that comment, which was actually explicitly mentioned in the comment.

This is a simple coding style change which should have no impact on runtime code execution.

Signed-off-by John Whitmore <[email protected]>

---
 drivers/staging/rtl8192u/r8192U_core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/staging/rtl8192u/r8192U_core.c +1 -1

index e218b5c20642..13926a83f430 100644
@@ -1997,7 +1997,7 @@ static void rtl8192_update_ratr_table(struct net_device *dev)
 		break;
 	case IEEE_N_24G:
 	case IEEE_N_5G:
-		if (ieee->pHTInfo->PeerMimoPs == 0) { /* MIMO_PS_STATIC */
+		if (ieee->pHTInfo->PeerMimoPs == MIMO_PS_STATIC) {
 			ratr_value &= 0x0007F007;
 		} else {
 			if (priv->rf_type == RF_1T2R)

Signature · 1 line

2.18.0

John Whitmore

author

2018-08-17 18:35 UTC #2 lore raw

PATCH 2/10 staging:rtl8192u: Rename sHTCLng - Style

In reply to John Whitmore

The constant sHTCLng causes a checkpatch issue, due to its use of CamelCase naming. To correct the issue the constant has been renamed to HTCLNG.

I'm not sure this is a good name as it communicates very little and contradicts the block comment above its definition. MCS_LEN might be a better name if the block comment is correct.

Additionally the block comment has been changed to the recommended style.

This is a coding style change which should have no impact on runtime code execution.

Signed-off-by John Whitmore <[email protected]>

---
 drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c |  2 +-
 drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h   | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c +1 -1

index 28cae82d795c..5f41b41c514e 100644
@@ -794,7 +794,7 @@ static u8 parse_subframe(struct sk_buff *skb,
 	}
 
 	if (rx_stats->bContainHTC) {
-		LLCOffset += sHTCLng;
+		LLCOffset += HTCLNG;
 	}
 	// Null packet, don't indicate it to upper layer
 	ChkLength = LLCOffset;/* + (Frame_WEP(frame)!=0 ?Adapter->MgntInfo.SecurityInfo.EncryptionHeadOverhead:0);*/

drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h +5 -6

index 7d54a7cd9514..0c6d6b352497 100644
@@ -12,12 +12,11 @@
 //
 #define MIMO_PS_STATIC				0
 
-//
-//	There should be 128 bits to cover all of the MCS rates. However, since
-//	8190 does not support too much rates, one integer is quite enough.
-//
-
-#define sHTCLng	4
+/*
+ * There should be 128 bits to cover all of the MCS rates. However, since
+ * 8190 does not support too much rates, one integer is quite enough.
+ */
+#define HTCLNG	4
 
 
 #define HT_SUPPORTED_MCS_1SS_BITMAP					0x000000ff

Signature · 1 line

2.18.0

John Whitmore

author

2018-08-17 18:35 UTC #3 lore raw

PATCH 3/10 staging:rtl8192u: Remove unnecessary blank lines - Style

In reply to John Whitmore

Removed blank lines which cause checkpatch issues.

This is a simple coding style change which should have no impact on runtime code execution.

Signed-off-by John Whitmore <[email protected]>

---
 drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h | 9 ---------
 1 file changed, 9 deletions(-)

drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h +0 -9

index 0c6d6b352497..69cb5884bbc4 100644
@@ -18,7 +18,6 @@
  */
 #define HTCLNG	4
 
-
 #define HT_SUPPORTED_MCS_1SS_BITMAP					0x000000ff
 #define HT_SUPPORTED_MCS_2SS_BITMAP					0x0000ff00
 #define HT_SUPPORTED_MCS_1SS_2SS_BITMAP			HT_MCS_1SS_BITMAP|HT_MCS_1SS_2SS_BITMAP

@@ -88,7 +87,6 @@ typedef	union _HT_CAPABILITY_MACPARA{
 */
 
 typedef	struct _HT_CAPABILITY_ELE {
-
 	//HT capability info
 	u8	AdvCoding:1;
 	u8	ChlWidth:1;

@@ -113,7 +111,6 @@ typedef	struct _HT_CAPABILITY_ELE {
 	//Supported MCS set
 	u8	MCS[16];
 
-
 	//Extended HT Capability Info
 	u16	ExtHTCapInfo;

@@ -193,7 +190,6 @@ typedef struct _RT_HIGH_THROUGHPUT {
 	// 802.11n spec version for "peer"
 	HT_SPEC_VER			ePeerHTSpecVer;
 
-
 	// HT related information for "Self"
 	HT_CAPABILITY_ELE	SelfHTCap;		// This is HT cap element sent to peer STA, which also indicate HT Rx capabilities.
 	HT_INFORMATION_ELE	SelfHTInfo;		// This is HT info element sent to peer STA, which also indicate HT Rx capabilities.

@@ -202,14 +198,12 @@ typedef struct _RT_HIGH_THROUGHPUT {
 	u8				PeerHTCapBuf[32];
 	u8				PeerHTInfoBuf[32];
 
-
 	// A-MSDU related
 	u8				bAMSDU_Support;			// This indicates Tx A-MSDU capability
 	u16				nAMSDU_MaxSize;			// This indicates Tx A-MSDU capability
 	u8				bCurrent_AMSDU_Support;	// This indicates Tx A-MSDU capability
 	u16				nCurrent_AMSDU_MaxSize;	// This indicates Tx A-MSDU capability
 
-
 	// AMPDU  related <2006.08.10 Emily>
 	u8				bAMPDUEnable;				// This indicate Tx A-MPDU capability
 	u8				bCurrentAMPDUEnable;		// This indicate Tx A-MPDU capability

@@ -283,7 +277,6 @@ typedef struct _RT_HIGH_THROUGHPUT {
 //------------------------------------------------------------
 
 typedef struct _BSS_HT {
-
 	u8				bdSupportHT;
 
 	// HT related elements

@@ -316,8 +309,6 @@ extern u8 MCS_FILTER_1SS[16];
 						(LegacyRate):\
 						(PICK_RATE(LegacyRate, HTRate))
 
-
-
 // MCS Bw 40 {1~7, 12~15,32}
 #define	RATE_ADPT_1SS_MASK		0xFF
 #define	RATE_ADPT_2SS_MASK		0xF0 //Skip MCS8~11 because mcs7 > mcs6, 9, 10, 11. 2007.01.16 by Emily

Signature · 1 line

2.18.0

John Whitmore

author

2018-08-17 18:35 UTC #4 lore raw

PATCH 4/10 staging:rtl8192u: Add required spaces - Style

In reply to John Whitmore

Add spaces required by coding style to clear checkpatch issues.

This is a coding style change which should have no impact on runtime code execution.

Signed-off-by John Whitmore <[email protected]>

---
 drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h +6 -6

index 69cb5884bbc4..da71f745f039 100644
@@ -20,7 +20,7 @@
 
 #define HT_SUPPORTED_MCS_1SS_BITMAP					0x000000ff
 #define HT_SUPPORTED_MCS_2SS_BITMAP					0x0000ff00
-#define HT_SUPPORTED_MCS_1SS_2SS_BITMAP			HT_MCS_1SS_BITMAP|HT_MCS_1SS_2SS_BITMAP
+#define HT_SUPPORTED_MCS_1SS_2SS_BITMAP			HT_MCS_1SS_BITMAP | HT_MCS_1SS_2SS_BITMAP
 
 //
 // Represent Channel Width in HT Capabilities

@@ -300,13 +300,13 @@ extern u8 MCS_FILTER_1SS[16];
    STA in A/B/G mode and AP is still in N mode. The macro will be wrong. We have
    to add a macro to judge wireless mode. */
 #define PICK_RATE(_nLegacyRate, _nMcsRate)	\
-		(_nMcsRate==0)?(_nLegacyRate&0x7f):(_nMcsRate)
+		(_nMcsRate == 0) ? (_nLegacyRate & 0x7f) : (_nMcsRate)
 /* 2007/07/12 MH We only define legacy and HT wireless mode now. */
 #define	LEGACY_WIRELESS_MODE	IEEE_MODE_MASK
 
 #define CURRENT_RATE(WirelessMode, LegacyRate, HTRate)	\
-					((WirelessMode & (LEGACY_WIRELESS_MODE))!=0)?\
-						(LegacyRate):\
+					((WirelessMode & (LEGACY_WIRELESS_MODE)) != 0) ?\
+						(LegacyRate) :\
 						(PICK_RATE(LegacyRate, HTRate))
 
 // MCS Bw 40 {1~7, 12~15,32}

@@ -314,7 +314,7 @@ extern u8 MCS_FILTER_1SS[16];
 #define	RATE_ADPT_2SS_MASK		0xF0 //Skip MCS8~11 because mcs7 > mcs6, 9, 10, 11. 2007.01.16 by Emily
 #define	RATE_ADPT_MCS32_MASK		0x01
 
-#define		IS_11N_MCS_RATE(rate)		(rate&0x80)
+#define		IS_11N_MCS_RATE(rate)		(rate & 0x80)
 
 typedef enum _HT_AGGRE_SIZE {
 	HT_AGG_SIZE_8K = 0,

@@ -331,7 +331,7 @@ typedef enum _HT_IOT_PEER
 	HT_IOT_PEER_BROADCOM = 2,
 	HT_IOT_PEER_RALINK = 3,
 	HT_IOT_PEER_ATHEROS = 4,
-	HT_IOT_PEER_CISCO= 5,
+	HT_IOT_PEER_CISCO = 5,
 	HT_IOT_PEER_MAX = 6
 }HT_IOT_PEER_E, *PHTIOT_PEER_E;

Signature · 1 line

2.18.0

John Whitmore

author

2018-08-17 18:35 UTC #5 lore raw

PATCH 5/10 staging:rtl8192u: Remove unused constants - Style

In reply to John Whitmore

Remove unused constants, this is a coding style change which should have no impact on runtime code execution.

Signed-off-by John Whitmore <[email protected]>

---
 drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h | 4 ----
 1 file changed, 4 deletions(-)

drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h +0 -4

index da71f745f039..947c381bce79 100644
@@ -18,10 +18,6 @@
  */
 #define HTCLNG	4
 
-#define HT_SUPPORTED_MCS_1SS_BITMAP					0x000000ff
-#define HT_SUPPORTED_MCS_2SS_BITMAP					0x0000ff00
-#define HT_SUPPORTED_MCS_1SS_2SS_BITMAP			HT_MCS_1SS_BITMAP | HT_MCS_1SS_2SS_BITMAP
-
 //
 // Represent Channel Width in HT Capabilities
 //

Signature · 1 line

2.18.0

John Whitmore

author

2018-08-17 18:35 UTC #6 lore raw

PATCH 6/10 staging:rtl8192u: Correct block comments - Style

In reply to John Whitmore

Correct the block comments so they conform to coding standard.

This is a coding style change which should not impact on runtime code execution.

Signed-off-by John Whitmore <[email protected]>

---
 .../staging/rtl8192u/ieee80211/rtl819x_HT.h   | 73 +++++++++----------
 1 file changed, 36 insertions(+), 37 deletions(-)

drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h +36 ~~-37~~

index 947c381bce79..5ead032735a6 100644
@@ -2,14 +2,14 @@
 #ifndef _RTL819XU_HTTYPE_H_
 #define _RTL819XU_HTTYPE_H_
 
-//------------------------------------------------------------
-// The HT Capability element is present in beacons, association request,
-//	reassociation request and probe response frames
-//------------------------------------------------------------
-
-//
-// MIMO Power Save Settings
-//
+/*
+ * The HT Capability element is present in beacons, association request,
+ * reassociation request and probe response frames
+ */
+
+/*
+ * MIMO Power Save Settings
+ */
 #define MIMO_PS_STATIC				0
 
 /*

@@ -18,18 +18,18 @@
  */
 #define HTCLNG	4
 
-//
-// Represent Channel Width in HT Capabilities
-//
+/*
+ * Represent Channel Width in HT Capabilities
+ */
 enum ht_channel_width {
 	HT_CHANNEL_WIDTH_20 = 0,
 	HT_CHANNEL_WIDTH_20_40 = 1,
 };
 
-//
-// Represent Extension Channel Offset in HT Capabilities
-// This is available only in 40Mhz mode.
-//
+/*
+ * Represent Extension Channel Offset in HT Capabilities
+ * This is available only in 40Mhz mode.
+ */
 enum ht_extension_chan_offset {
 	HT_EXTCHNL_OFFSET_NO_EXT = 0,
 	HT_EXTCHNL_OFFSET_UPPER = 1,

@@ -118,11 +118,10 @@ typedef	struct _HT_CAPABILITY_ELE {
 
 } __attribute__ ((packed)) HT_CAPABILITY_ELE, *PHT_CAPABILITY_ELE;
 
-//------------------------------------------------------------
-// The HT Information element is present in beacons
-// Only AP is required to include this element
-//------------------------------------------------------------
-
+/*
+ * The HT Information element is present in beacons
+ * Only AP is required to include this element
+ */
 typedef struct _HT_INFORMATION_ELE {
 	u8	ControlChl;

@@ -161,12 +160,11 @@ typedef enum _HT_AGGRE_MODE_E {
 	HT_AGG_FORCE_DISABLE = 2,
 }HT_AGGRE_MODE_E, *PHT_AGGRE_MODE_E;
 
-//------------------------------------------------------------
-//  The Data structure is used to keep HT related variables when card is
-//  configured as non-AP STA mode.  **Note**  Current_xxx should be set
-//	to default value in HTInitializeHTInfo()
-//------------------------------------------------------------
-
+/*
+ *  The Data structure is used to keep HT related variables when card is
+ *  configured as non-AP STA mode.  **Note**  Current_xxx should be set
+ *  to default value in HTInitializeHTInfo()
+ */
 typedef struct _RT_HIGH_THROUGHPUT {
 	u8				bEnableHT;
 	u8				bCurrentHTSupport;

@@ -267,11 +265,10 @@ typedef struct _RT_HIGH_THROUGHPUT {
 	u32				IOTAction;
 } __attribute__ ((packed)) RT_HIGH_THROUGHPUT, *PRT_HIGH_THROUGHPUT;
 
-//------------------------------------------------------------
-// The Data structure is used to keep HT related variable for "each AP"
-// when card is configured as "STA mode"
-//------------------------------------------------------------
-
+/*
+ * The Data structure is used to keep HT related variable for "each AP"
+ * when card is configured as "STA mode"
+ */
 typedef struct _BSS_HT {
 	u8				bdSupportHT;

@@ -292,9 +289,11 @@ typedef struct _BSS_HT {
 extern u8 MCS_FILTER_ALL[16];
 extern u8 MCS_FILTER_1SS[16];
 
-/* 2007/07/11 MH Modify the macro. Becaus STA may link with a N-AP. If we set
-   STA in A/B/G mode and AP is still in N mode. The macro will be wrong. We have
-   to add a macro to judge wireless mode. */
+/*
+ * 2007/07/11 MH Modify the macro. Becaus STA may link with a N-AP. If we set
+ * STA in A/B/G mode and AP is still in N mode. The macro will be wrong. We have
+ * to add a macro to judge wireless mode.
+ */
 #define PICK_RATE(_nLegacyRate, _nMcsRate)	\
 		(_nMcsRate == 0) ? (_nLegacyRate & 0x7f) : (_nMcsRate)
 /* 2007/07/12 MH We only define legacy and HT wireless mode now. */

@@ -331,9 +330,9 @@ typedef enum _HT_IOT_PEER
 	HT_IOT_PEER_MAX = 6
 }HT_IOT_PEER_E, *PHTIOT_PEER_E;
 
-//
-// IOT Action for different AP
-//
+/*
+ * IOT Action for different AP
+ */
 typedef enum _HT_IOT_ACTION {
 	HT_IOT_ACT_TX_USE_AMSDU_4K = 0x00000001,
 	HT_IOT_ACT_TX_USE_AMSDU_8K = 0x00000002,

Signature · 1 line

2.18.0

John Whitmore

author

2018-08-17 18:35 UTC #7 lore raw

PATCH 7/10 staging:rtl8192u: Remove unused CHHLOP_IN_PROGRESS - Style

In reply to John Whitmore

The macro CHHLOP_IN_PROGRESS is never used in code, so has been removed.

This is a coding style change which should have no impact on runtime code execution.

Signed-off-by John Whitmore <[email protected]>

---
 drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h | 4 ----
 1 file changed, 4 deletions(-)

drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h +0 -4

index 5ead032735a6..831a85bdbd2e 100644
@@ -44,10 +44,6 @@ typedef enum _CHNLOP {
 	CHNLOP_SWCHNL = 3, // Software Channel switching in progress
 } CHNLOP, *PCHNLOP;
 
-// Determine if the Channel Operation is in progress
-#define CHHLOP_IN_PROGRESS(_pHTInfo)	\
-		((_pHTInfo)->ChnlOp > CHNLOP_NONE) ? TRUE : FALSE
-
 /*
 typedef	union _HT_CAPABILITY{
 	u16	ShortData;

Signature · 1 line

2.18.0

John Whitmore

author

2018-08-17 18:35 UTC #8 lore raw

PATCH 8/10 staging:rtl8192u: Removed commented out structure - Style

In reply to John Whitmore

Two unions HT_CAPABILITY and HT_CAPABILITY_MACPARA have previously been commented out of code. Since they are obviously not used in code and the commented out unions add nothing to the code they have been removed.

This is a coding style change which should have no impact on runtime code execution.

Signed-off-by John Whitmore <[email protected]>

---
 .../staging/rtl8192u/ieee80211/rtl819x_HT.h   | 34 -------------------
 1 file changed, 34 deletions(-)

drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h +0 ~~-34~~

index 831a85bdbd2e..f63c028b900a 100644
@@ -44,40 +44,6 @@ typedef enum _CHNLOP {
 	CHNLOP_SWCHNL = 3, // Software Channel switching in progress
 } CHNLOP, *PCHNLOP;
 
-/*
-typedef	union _HT_CAPABILITY{
-	u16	ShortData;
-	u8	CharData[2];
-	struct
-	{
-		u16	AdvCoding:1;
-		u16	ChlWidth:1;
-		u16	MimoPwrSave:2;
-		u16	GreenField:1;
-		u16	ShortGI20Mhz:1;
-		u16	ShortGI40Mhz:1;
-		u16	STBC:1;
-		u16	BeamForm:1;
-		u16	DelayBA:1;
-		u16	MaxAMSDUSize:1;
-		u16	DssCCk:1;
-		u16	PSMP:1;
-		u16	Rsvd:3;
-	}Field;
-}HT_CAPABILITY, *PHT_CAPABILITY;
-
-typedef	union _HT_CAPABILITY_MACPARA{
-	u8	ShortData;
-	u8	CharData[1];
-	struct
-	{
-		u8	MaxRxAMPDU:2;
-		u8	MPDUDensity:2;
-		u8	Rsvd:4;
-	}Field;
-}HT_CAPABILITY_MACPARA, *PHT_CAPABILITY_MACPARA;
-*/
-
 typedef	struct _HT_CAPABILITY_ELE {
 	//HT capability info
 	u8	AdvCoding:1;

Signature · 1 line

2.18.0

John Whitmore

author

2018-08-17 18:35 UTC #9 lore raw

PATCH 9/10 staging:rtl8192u: Remove enum CHNLOP - Style

In reply to John Whitmore

The enumerated type CHNLOP is only used as a member variable of the structure RT_HIGH_THROUGHPUT. Whilst this member variable is initialised it is never actually used in the code. To simplify the code both the enumerated type and the member variable have been removed.

This is a coding style change which should have no impact on runtime code execution.

Signed-off-by John Whitmore <[email protected]>

---
 drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h     | 8 --------
 drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 1 -
 2 files changed, 9 deletions(-)

drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h +0 -8

index f63c028b900a..176caa74e4a8 100644
@@ -37,13 +37,6 @@ enum ht_extension_chan_offset {
 	HT_EXTCHNL_OFFSET_LOWER = 3,
 };
 
-typedef enum _CHNLOP {
-	CHNLOP_NONE = 0, // No Action now
-	CHNLOP_SCAN = 1, // Scan in progress
-	CHNLOP_SWBW = 2, // Bandwidth switching in progress
-	CHNLOP_SWCHNL = 3, // Software Channel switching in progress
-} CHNLOP, *PCHNLOP;
-
 typedef	struct _HT_CAPABILITY_ELE {
 	//HT capability info
 	u8	AdvCoding:1;

@@ -192,7 +185,6 @@ typedef struct _RT_HIGH_THROUGHPUT {
 
 	// For Bandwidth Switching
 	u8				bSwBwInProgress;
-	CHNLOP				ChnlOp; // software switching channel in progress. By Bruce, 2008-02-15.
 	u8				SwBwStep;
 	//struct timer_list		SwBwTimer;  //moved to ieee80211_device. as timer_list need include some header file here.

drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c +0 -1

index b948eae5909d..155805e20143 100644
@@ -1122,7 +1122,6 @@ void HTInitializeHTInfo(struct ieee80211_device *ieee)
 	memset(&pHTInfo->PeerHTInfoBuf, 0, sizeof(pHTInfo->PeerHTInfoBuf));
 
 	pHTInfo->bSwBwInProgress = false;
-	pHTInfo->ChnlOp = CHNLOP_NONE;
 
 	// Set default IEEE spec for Draft N
 	pHTInfo->ePeerHTSpecVer = HT_SPEC_VER_IEEE;

Signature · 1 line

2.18.0

John Whitmore

author

2018-08-17 18:35 UTC #10 lore raw

PATCH 10/10 staging:rtl8192u: Refactor struct HT_CAPABILITY_ELE - Style

In reply to John Whitmore

The structure HT_CAPABILITY_ELE causes a number of checkpatch / coding style issues. The structure uses a 'typedef' directive causing an issue regarding defining new types in the code. The name of the structure should be lowercase, and the '__packed' directive is prefered over the attribute directive.

The typedef has been removed, structure renamed to ht_capability_ele and the '__packed' directive used.

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

Signed-off-by John Whitmore <[email protected]>

---
 .../staging/rtl8192u/ieee80211/ieee80211_wx.c |  6 ++--
 .../staging/rtl8192u/ieee80211/rtl819x_HT.h   |  8 ++---
 .../rtl8192u/ieee80211/rtl819x_HTProc.c       | 36 +++++++++----------
 3 files changed, 25 insertions(+), 25 deletions(-)

drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c +3 -3

index f2fcdec9bd17..fa59c712c74b 100644
@@ -147,13 +147,13 @@ static inline char *rtl819x_translate_scan(struct ieee80211_device *ieee,
 
 	if (network->mode >= IEEE_N_24G)//add N rate here;
 	{
-		PHT_CAPABILITY_ELE ht_cap = NULL;
+		struct ht_capability_ele *ht_cap = NULL;
 		bool is40M = false, isShortGI = false;
 		u8 max_mcs = 0;
 		if (!memcmp(network->bssht.bdHTCapBuf, EWC11NHTCap, 4))
-			ht_cap = (PHT_CAPABILITY_ELE)&network->bssht.bdHTCapBuf[4];
+			ht_cap = (struct ht_capability_ele *)&network->bssht.bdHTCapBuf[4];
 		else
-			ht_cap = (PHT_CAPABILITY_ELE)&network->bssht.bdHTCapBuf[0];
+			ht_cap = (struct ht_capability_ele *)&network->bssht.bdHTCapBuf[0];
 		is40M = (ht_cap->ChlWidth)?1:0;
 		isShortGI = (ht_cap->ChlWidth)?
 						((ht_cap->ShortGI40Mhz)?1:0):

drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h +4 -4

index 176caa74e4a8..64d5359cf7e2 100644
@@ -37,7 +37,7 @@ enum ht_extension_chan_offset {
 	HT_EXTCHNL_OFFSET_LOWER = 3,
 };
 
-typedef	struct _HT_CAPABILITY_ELE {
+struct ht_capability_ele {
 	//HT capability info
 	u8	AdvCoding:1;
 	u8	ChlWidth:1;

@@ -71,7 +71,7 @@ typedef	struct _HT_CAPABILITY_ELE {
 	//Antenna Selection Capabilities
 	u8	ASCap;
 
-} __attribute__ ((packed)) HT_CAPABILITY_ELE, *PHT_CAPABILITY_ELE;
+} __packed;
 
 /*
  * The HT Information element is present in beacons

@@ -140,7 +140,7 @@ typedef struct _RT_HIGH_THROUGHPUT {
 	HT_SPEC_VER			ePeerHTSpecVer;
 
 	// HT related information for "Self"
-	HT_CAPABILITY_ELE	SelfHTCap;		// This is HT cap element sent to peer STA, which also indicate HT Rx capabilities.
+	struct ht_capability_ele	SelfHTCap;		// This is HT cap element sent to peer STA, which also indicate HT Rx capabilities.
 	HT_INFORMATION_ELE	SelfHTInfo;		// This is HT info element sent to peer STA, which also indicate HT Rx capabilities.
 
 	// HT related information for "Peer"

@@ -233,7 +233,7 @@ typedef struct _BSS_HT {
 	u16					bdHTInfoLen;
 
 	HT_SPEC_VER				bdHTSpecVer;
-	//HT_CAPABILITY_ELE			bdHTCapEle;
+	//struct ht_capability_ele              bdHTCapEle;
 	//HT_INFORMATION_ELE		bdHTInfoEle;
 
 	u8					bdRT2RTAggregation;

drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c +18 ~~-18~~

index 155805e20143..9bf52cebe4cd 100644
@@ -130,15 +130,15 @@ void HTUpdateDefaultSetting(struct ieee80211_device *ieee)
  */
 void HTDebugHTCapability(u8 *CapIE, u8 *TitleString)
 {
-	static u8	EWC11NHTCap[] = {0x00, 0x90, 0x4c, 0x33};	// For 11n EWC definition, 2007.07.17, by Emily
-	PHT_CAPABILITY_ELE		pCapELE;
+	static u8	          EWC11NHTCap[] = {0x00, 0x90, 0x4c, 0x33};	// For 11n EWC definition, 2007.07.17, by Emily
+	struct ht_capability_ele *pCapELE;
 
 	if (!memcmp(CapIE, EWC11NHTCap, sizeof(EWC11NHTCap))) {
 		//EWC IE
 		IEEE80211_DEBUG(IEEE80211_DL_HT, "EWC IE in %s()\n", __func__);
-		pCapELE = (PHT_CAPABILITY_ELE)(&CapIE[4]);
+		pCapELE = (struct ht_capability_ele *)(&CapIE[4]);
 	} else {
-		pCapELE = (PHT_CAPABILITY_ELE)(&CapIE[0]);
+		pCapELE = (struct ht_capability_ele *)(&CapIE[0]);
 	}
 	IEEE80211_DEBUG(IEEE80211_DL_HT, "<Log HT Capability>. Called by %s\n", TitleString);

@@ -230,7 +230,7 @@ static bool IsHTHalfNmode40Bandwidth(struct ieee80211_device *ieee)
 		retValue = false;
 	else if (!ieee->GetHalfNmodeSupportByAPsHandler(ieee->dev))	// station in half n mode
 		retValue = false;
-	else if (((PHT_CAPABILITY_ELE)(pHTInfo->PeerHTCapBuf))->ChlWidth) // ap support 40 bw
+	else if (((struct ht_capability_ele *)(pHTInfo->PeerHTCapBuf))->ChlWidth) // ap support 40 bw
 		retValue = true;
 	else
 		retValue = false;

@@ -248,12 +248,12 @@ static bool IsHTHalfNmodeSGI(struct ieee80211_device *ieee, bool is40MHz)
 	else if (!ieee->GetHalfNmodeSupportByAPsHandler(ieee->dev))	// station in half n mode
 		retValue = false;
 	else if (is40MHz) { // ap support 40 bw
-		if (((PHT_CAPABILITY_ELE)(pHTInfo->PeerHTCapBuf))->ShortGI40Mhz) // ap support 40 bw short GI
+		if (((struct ht_capability_ele *)(pHTInfo->PeerHTCapBuf))->ShortGI40Mhz) // ap support 40 bw short GI
 			retValue = true;
 		else
 			retValue = false;
 	} else {
-		if (((PHT_CAPABILITY_ELE)(pHTInfo->PeerHTCapBuf))->ShortGI20Mhz) // ap support 40 bw short GI
+		if (((struct ht_capability_ele *)(pHTInfo->PeerHTCapBuf))->ShortGI20Mhz) // ap support 40 bw short GI
 			retValue = true;
 		else
 			retValue = false;

@@ -530,7 +530,7 @@ void HTResetIOTSetting(PRT_HIGH_THROUGHPUT pHTInfo)
 void HTConstructCapabilityElement(struct ieee80211_device *ieee, u8 *posHTCap, u8 *len, u8 IsEncrypt)
 {
 	PRT_HIGH_THROUGHPUT	pHT = ieee->pHTInfo;
-	PHT_CAPABILITY_ELE	pCapELE = NULL;
+	struct ht_capability_ele   *pCapELE = NULL;
 	//u8 bIsDeclareMCS13;
 
 	if (!posHTCap || !pHT) {

@@ -544,9 +544,9 @@ void HTConstructCapabilityElement(struct ieee80211_device *ieee, u8 *posHTCap, u
 		u8	EWC11NHTCap[] = {0x00, 0x90, 0x4c, 0x33};	// For 11n EWC definition, 2007.07.17, by Emily
 
 		memcpy(posHTCap, EWC11NHTCap, sizeof(EWC11NHTCap));
-		pCapELE = (PHT_CAPABILITY_ELE)&posHTCap[4];
+		pCapELE = (struct ht_capability_ele *)&posHTCap[4];
 	} else {
-		pCapELE = (PHT_CAPABILITY_ELE)posHTCap;
+		pCapELE = (struct ht_capability_ele *)posHTCap;
 	}
 
 	//HT capability info

@@ -898,7 +898,7 @@ void HTSetConnectBwMode(struct ieee80211_device *ieee, enum ht_channel_width Ban
 void HTOnAssocRsp(struct ieee80211_device *ieee)
 {
 	PRT_HIGH_THROUGHPUT	pHTInfo = ieee->pHTInfo;
-	PHT_CAPABILITY_ELE		pPeerHTCap = NULL;
+	struct ht_capability_ele       *pPeerHTCap = NULL;
 	PHT_INFORMATION_ELE		pPeerHTInfo = NULL;
 	u16	nMaxAMSDUSize = 0;
 	u8	*pMcsFilter = NULL;

@@ -913,16 +913,16 @@ void HTOnAssocRsp(struct ieee80211_device *ieee)
 		return;
 	}
 	IEEE80211_DEBUG(IEEE80211_DL_HT, "===> HTOnAssocRsp_wq(): HT_ENABLE\n");
-//	IEEE80211_DEBUG_DATA(IEEE80211_DL_DATA, pHTInfo->PeerHTCapBuf, sizeof(HT_CAPABILITY_ELE));
+//	IEEE80211_DEBUG_DATA(IEEE80211_DL_DATA, pHTInfo->PeerHTCapBuf, sizeof(struct ht_capability_ele));
 //	IEEE80211_DEBUG_DATA(IEEE80211_DL_DATA, pHTInfo->PeerHTInfoBuf, sizeof(HT_INFORMATION_ELE));
 
 //	HTDebugHTCapability(pHTInfo->PeerHTCapBuf,"HTOnAssocRsp_wq");
 //	HTDebugHTInfo(pHTInfo->PeerHTInfoBuf,"HTOnAssocRsp_wq");
 	//
 	if (!memcmp(pHTInfo->PeerHTCapBuf, EWC11NHTCap, sizeof(EWC11NHTCap)))
-		pPeerHTCap = (PHT_CAPABILITY_ELE)(&pHTInfo->PeerHTCapBuf[4]);
+		pPeerHTCap = (struct ht_capability_ele *)(&pHTInfo->PeerHTCapBuf[4]);
 	else
-		pPeerHTCap = (PHT_CAPABILITY_ELE)(pHTInfo->PeerHTCapBuf);
+		pPeerHTCap = (struct ht_capability_ele *)(pHTInfo->PeerHTCapBuf);
 
 	if (!memcmp(pHTInfo->PeerHTInfoBuf, EWC11NHTInfo, sizeof(EWC11NHTInfo)))
 		pPeerHTInfo = (PHT_INFORMATION_ELE)(&pHTInfo->PeerHTInfoBuf[4]);

@@ -932,7 +932,7 @@ void HTOnAssocRsp(struct ieee80211_device *ieee)
 	////////////////////////////////////////////////////////
 	// Configurations:
 	////////////////////////////////////////////////////////
-	IEEE80211_DEBUG_DATA(IEEE80211_DL_DATA | IEEE80211_DL_HT, pPeerHTCap, sizeof(HT_CAPABILITY_ELE));
+	IEEE80211_DEBUG_DATA(IEEE80211_DL_DATA | IEEE80211_DL_HT, pPeerHTCap, sizeof(struct ht_capability_ele));
 //	IEEE80211_DEBUG_DATA(IEEE80211_DL_DATA|IEEE80211_DL_HT, pPeerHTInfo, sizeof(HT_INFORMATION_ELE));
 	// Config Supported Channel Width setting
 	//

@@ -1176,7 +1176,7 @@ void HTResetSelfAndSavePeerSetting(struct ieee80211_device *ieee,	struct ieee802
 {
 	PRT_HIGH_THROUGHPUT		pHTInfo = ieee->pHTInfo;
 //	u16						nMaxAMSDUSize;
-//	PHT_CAPABILITY_ELE		pPeerHTCap = (PHT_CAPABILITY_ELE)pNetwork->bssht.bdHTCapBuf;
+//	struct ht_capability_ele       *pPeerHTCap = (struct ht_capability_ele *)pNetwork->bssht.bdHTCapBuf;
 //	PHT_INFORMATION_ELE		pPeerHTInfo = (PHT_INFORMATION_ELE)pNetwork->bssht.bdHTInfoBuf;
 //	u8*	pMcsFilter;
 	u8	bIOTAction = 0;

@@ -1249,8 +1249,8 @@ void HTResetSelfAndSavePeerSetting(struct ieee80211_device *ieee,	struct ieee802
 
 void HTUpdateSelfAndPeerSetting(struct ieee80211_device *ieee,	struct ieee80211_network *pNetwork)
 {
-	PRT_HIGH_THROUGHPUT	pHTInfo = ieee->pHTInfo;
-//	PHT_CAPABILITY_ELE		pPeerHTCap = (PHT_CAPABILITY_ELE)pNetwork->bssht.bdHTCapBuf;
+	PRT_HIGH_THROUGHPUT	        pHTInfo = ieee->pHTInfo;
+//	struct ht_capability_ele       *pPeerHTCap = (struct ht_capability_ele *)pNetwork->bssht.bdHTCapBuf;
 	PHT_INFORMATION_ELE		pPeerHTInfo = (PHT_INFORMATION_ELE)pNetwork->bssht.bdHTInfoBuf;
 
 	if (pHTInfo->bCurrentHTSupport) {

Signature · 1 line

2.18.0