From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Tue, 19 Jul 2011 03:30:34 +0000 (-0500)
Subject: staging: rtl8192e: Convert typedef CHANNEL_ACCESS_SETTING to struct channel_access_se... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=e91dbf030128ddd975a336a6e11f76874f5c3985;p=deliverable%2Flinux.git

staging: rtl8192e: Convert typedef CHANNEL_ACCESS_SETTING to struct channel_access_setting

Remove typedef from struct.
Rename struct.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
---

diff --git a/drivers/staging/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/r8192E_dev.c
index 688b4f536bcb..b5324a3fc359 100644
--- a/drivers/staging/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/r8192E_dev.c
@@ -2280,7 +2280,7 @@ void
 ActUpdateChannelAccessSetting(
 	struct net_device*			dev,
 	WIRELESS_MODE			WirelessMode,
-	PCHANNEL_ACCESS_SETTING	ChnlAccessSetting
+	struct channel_access_setting *ChnlAccessSetting
 	)
 {
 		struct r8192_priv* priv = rtllib_priv(dev);
diff --git a/drivers/staging/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl_core.h
index c4d70e3ccd88..9ffac40acda0 100644
--- a/drivers/staging/rtl8192e/rtl_core.h
+++ b/drivers/staging/rtl8192e/rtl_core.h
@@ -472,14 +472,14 @@ typedef struct Stats
 	u32	CurrentShowTxate;
 } Stats;
 
-typedef struct	ChnlAccessSetting {
+struct channel_access_setting {
 	u16 SIFS_Timer;
 	u16 DIFS_Timer;
 	u16 SlotTimeTimer;
 	u16 EIFS_Timer;
 	u16 CWminIndex;
 	u16 CWmaxIndex;
-}*PCHANNEL_ACCESS_SETTING,CHANNEL_ACCESS_SETTING;
+};
 
 typedef enum _TWO_PORT_STATUS
 {
@@ -579,7 +579,7 @@ typedef struct r8192_priv
 
 	struct workqueue_struct		*priv_wq;
 
-	CHANNEL_ACCESS_SETTING	ChannelAccessSetting;
+	struct channel_access_setting ChannelAccessSetting;
 
 	mp_adapter				NdisAdapter;
 
@@ -1106,7 +1106,7 @@ void
 ActUpdateChannelAccessSetting(
 	struct net_device*			dev,
 	WIRELESS_MODE			WirelessMode,
-	PCHANNEL_ACCESS_SETTING	ChnlAccessSetting
+	struct channel_access_setting *ChnlAccessSetting
 	);
 
 #endif