Skip to content

Commit

Permalink
Staging: winbond: Convert typedef struct _STRUCT_SELECTOR
Browse files Browse the repository at this point in the history
This patch converts the declaration typedef struct _STRUCT_SELECTOR
to struct struct_selector and also the places where it was used.

Signed-off-by: Sankar P <sankar.curiosity@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Sankar P authored and Greg Kroah-Hartman committed May 11, 2010
1 parent ef1566e commit 2de9753
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions drivers/staging/winbond/mac_structures.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand All @@ -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 --
Expand Down Expand Up @@ -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));


Expand Down

0 comments on commit 2de9753

Please sign in to comment.