From 864ca0343b5cce0e9ea9e64b879d68e6b200c32a Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@cs.helsinki.fi>
Date: Fri, 18 Dec 2009 23:08:16 +0200
Subject: [PATCH] --- yaml --- r: 186551 b: refs/heads/master c:
 92ce4703920dc1bb380c12498a2f6bb825effbc7 h: refs/heads/master i:   186549:
 7aa8a7fe397923321a8e3e5fffc9cb7ab1951bb9   186547:
 f3d75c91265bfca2a1ce9f6bd36ae412ca2b0710   186543:
 b65ba194c8a10e16b563e4800d608d8a37054e7f v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/staging/winbond/localpara.h | 6 +++---
 trunk/drivers/staging/winbond/sme_api.h   | 2 --
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 4744f3e91258..775aa3e60a5a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1bc5e651295ab35fc7d396d940cf9a1e530c0a7e
+refs/heads/master: 92ce4703920dc1bb380c12498a2f6bb825effbc7
diff --git a/trunk/drivers/staging/winbond/localpara.h b/trunk/drivers/staging/winbond/localpara.h
index b731875f80f5..b82d5ce4b1bd 100644
--- a/trunk/drivers/staging/winbond/localpara.h
+++ b/trunk/drivers/staging/winbond/localpara.h
@@ -129,11 +129,11 @@ typedef struct _CHAN_LIST
 	ChanInfo		Channel[50]; // 100B
 } CHAN_LIST, *psCHAN_LIST;
 
-typedef struct _RadioOff
+struct radio_off
 {
 	u8			boHwRadioOff;
 	u8			boSwRadioOff;
-} RadioOff, *psRadioOff;
+};
 
 //===========================================================================
 struct wb_local_para
@@ -186,7 +186,7 @@ struct wb_local_para
     u16			ListenInterval;     	// The listen interval when SME invoking MLME_
             	                    	// (Re)Associate_Request().
 
-	RadioOff		RadioOffStatus;
+	struct radio_off		RadioOffStatus;
 	u8			Reserved0[2];
 
 	u8			boMsRadioOff;			// Ndis demands to be true when set Disassoc. OID and be false when set SSID OID.
diff --git a/trunk/drivers/staging/winbond/sme_api.h b/trunk/drivers/staging/winbond/sme_api.h
index 549878302288..62c256499bc4 100644
--- a/trunk/drivers/staging/winbond/sme_api.h
+++ b/trunk/drivers/staging/winbond/sme_api.h
@@ -193,8 +193,6 @@ s8 sme_get_cwmin_value(void *pcore_data, u8 *cwmin);
 s8 sme_get_cwmax_value(void *pcore_data, u16 *cwmax);
 s8 sme_get_ms_radio_mode(void *pcore_data, u8 * pMsRadioOff);
 s8 sme_set_ms_radio_mode(void *pcore_data, u8 boMsRadioOff);
-s8 sme_get_radio_mode(void *pcore_data, psRadioOff pRadioOffData);
-s8 sme_set_radio_mode(void *pcore_data, RadioOff RadioOffData);
 
 void sme_get_tx_power_level(void *pcore_data, u32 *TxPower);
 u8 sme_set_tx_power_level(void *pcore_data, u32 TxPower);