From 55ef731a2b4d016919c11e940bb8201f08e514f1 Mon Sep 17 00:00:00 2001
From: Sankar P <sankar.curiosity@gmail.com>
Date: Sat, 20 Mar 2010 02:11:01 +0530
Subject: [PATCH] --- yaml --- r: 197059 b: refs/heads/master c:
 2de975336fbcf5a7b76703b00276668d0f932ebe h: refs/heads/master i:   197057:
 e30ee1829e99f2f93f029611e4d5cd7f1d3e9dad   197055:
 e3615f7b4fddf67f7437da756eb98f2305bcd941 v: v3

---
 [refs]                                         |  2 +-
 trunk/drivers/staging/winbond/mac_structures.h | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 25d2ba6057a1..2183f262ebc5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef1566e2bb23bc4d7384c27fe973f4d16c2f3c25
+refs/heads/master: 2de975336fbcf5a7b76703b00276668d0f932ebe
diff --git a/trunk/drivers/staging/winbond/mac_structures.h b/trunk/drivers/staging/winbond/mac_structures.h
index 44c1aaf211af..f24dbb955bfe 100644
--- a/trunk/drivers/staging/winbond/mac_structures.h
+++ b/trunk/drivers/staging/winbond/mac_structures.h
@@ -436,7 +436,7 @@ struct Extended_Supported_Rates_Element
 #define OUI_CIPHER_CCMP				0x04
 #define OUI_CIPHER_WEP_104			0x05
 
-typedef struct _SUITE_SELECTOR_
+struct suite_selector
 {
 	union
 	{
@@ -447,23 +447,23 @@ typedef struct _SUITE_SELECTOR_
 			u8	Type;
 		}SuitSelector;
 	};
-}SUITE_SELECTOR;
+};
 
 //--  WPA  --
 struct	RSN_Information_Element
 {
 	u8					Element_ID;
 	u8					Length;
-	SUITE_SELECTOR	OuiWPAAdditional;//WPA version 2.0 additional field, and should be 00:50:F2:01
+	struct suite_selector	OuiWPAAdditional; /* WPA version 2.0 additional field, and should be 00:50:F2:01 */
 	u16					Version;
-	SUITE_SELECTOR		GroupKeySuite;
+	struct suite_selector		GroupKeySuite;
 	u16					PairwiseKeySuiteCount;
-	SUITE_SELECTOR		PairwiseKeySuite[1];
+	struct suite_selector		PairwiseKeySuite[1];
 }__attribute__ ((packed));
 struct RSN_Auth_Sub_Information_Element
 {
 	u16				AuthKeyMngtSuiteCount;
-	SUITE_SELECTOR	AuthKeyMngtSuite[1];
+	struct suite_selector	AuthKeyMngtSuite[1];
 }__attribute__ ((packed));
 
 //--  WPA2  --
@@ -508,16 +508,16 @@ struct	WPA2_RSN_Information_Element
 	u8					Element_ID;
 	u8					Length;
 	u16					Version;
-	SUITE_SELECTOR		GroupKeySuite;
+	struct suite_selector		GroupKeySuite;
 	u16					PairwiseKeySuiteCount;
-	SUITE_SELECTOR		PairwiseKeySuite[1];
+	struct suite_selector		PairwiseKeySuite[1];
 
 }__attribute__ ((packed));
 
 struct WPA2_RSN_Auth_Sub_Information_Element
 {
 	u16				AuthKeyMngtSuiteCount;
-	SUITE_SELECTOR	AuthKeyMngtSuite[1];
+	struct suite_selector	AuthKeyMngtSuite[1];
 }__attribute__ ((packed));