From: Mike Sheldon <mike@mikeasoft.com>
To: greg@kroah.com, pavel@ucw.cz
Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
Mike Sheldon <mike@mikeasoft.com>
Subject: [PATCH 01/15] Staging: winbond: Fix spacing around brackets and colons
Date: Thu, 27 May 2010 00:39:38 +0100 [thread overview]
Message-ID: <1274917192-16962-1-git-send-email-mike@mikeasoft.com> (raw)
Patches mac_structures.h to correct the spacing around brackets and colons as reported by checkpatch.pl
Signed-off-by: Mike Sheldon <mike@mikeasoft.com>
---
drivers/staging/winbond/mac_structures.h | 86 ++++++++++++-----------------
1 files changed, 36 insertions(+), 50 deletions(-)
diff --git a/drivers/staging/winbond/mac_structures.h b/drivers/staging/winbond/mac_structures.h
index 7441015..84ab290 100644
--- a/drivers/staging/winbond/mac_structures.h
+++ b/drivers/staging/winbond/mac_structures.h
@@ -420,22 +420,18 @@ struct Extended_Supported_Rates_Element {
#define OUI_CIPHER_CCMP 0x04
#define OUI_CIPHER_WEP_104 0x05
-struct suite_selector
-{
- union
- {
+struct suite_selector {
+ union {
u8 Value[4];
- struct _SUIT_
- {
+ struct _SUIT_ {
u8 OUI[3];
u8 Type;
- }SuitSelector;
+ } SuitSelector;
};
};
//-- WPA --
-struct RSN_Information_Element
-{
+struct RSN_Information_Element {
u8 Element_ID;
u8 Length;
struct suite_selector OuiWPAAdditional; /* WPA version 2.0 additional field, and should be 00:50:F2:01 */
@@ -443,52 +439,45 @@ struct RSN_Information_Element
struct suite_selector GroupKeySuite;
u16 PairwiseKeySuiteCount;
struct suite_selector PairwiseKeySuite[1];
-}__attribute__ ((packed));
-struct RSN_Auth_Sub_Information_Element
-{
+} __attribute__ ((packed));
+struct RSN_Auth_Sub_Information_Element {
u16 AuthKeyMngtSuiteCount;
struct suite_selector AuthKeyMngtSuite[1];
-}__attribute__ ((packed));
+} __attribute__ ((packed));
/* -- WPA2 -- */
-struct RSN_Capability_Element
-{
- union
- {
+struct RSN_Capability_Element {
+ union {
u16 __attribute__ ((packed)) wValue;
#ifdef _BIG_ENDIAN_ /* 20060927 add by anson's endian */
- struct _RSN_Capability
- {
- u16 __attribute__ ((packed)) Reserved2 : 8; /* 20051201 */
- u16 __attribute__ ((packed)) Reserved1 : 2;
- u16 __attribute__ ((packed)) GTK_Replay_Counter : 2;
- u16 __attribute__ ((packed)) PTK_Replay_Counter : 2;
- u16 __attribute__ ((packed)) No_Pairwise : 1;
- u16 __attribute__ ((packed)) Pre_Auth : 1;
- }__attribute__ ((packed)) RSN_Capability;
+ struct _RSN_Capability {
+ u16 __attribute__ ((packed)) Reserved2:8; /* 20051201 */
+ u16 __attribute__ ((packed)) Reserved1:2;
+ u16 __attribute__ ((packed)) GTK_Replay_Counter:2;
+ u16 __attribute__ ((packed)) PTK_Replay_Counter:2;
+ u16 __attribute__ ((packed)) No_Pairwise:1;
+ u16 __attribute__ ((packed)) Pre_Auth:1;
+ } __attribute__ ((packed)) RSN_Capability;
#else
- struct _RSN_Capability
- {
- u16 __attribute__ ((packed)) Pre_Auth : 1;
- u16 __attribute__ ((packed)) No_Pairwise : 1;
- u16 __attribute__ ((packed)) PTK_Replay_Counter : 2;
- u16 __attribute__ ((packed)) GTK_Replay_Counter : 2;
- u16 __attribute__ ((packed)) Reserved1 : 2;
- u16 __attribute__ ((packed)) Reserved2 : 8; /* 20051201 */
- }__attribute__ ((packed)) RSN_Capability;
+ struct _RSN_Capability {
+ u16 __attribute__ ((packed)) Pre_Auth:1;
+ u16 __attribute__ ((packed)) No_Pairwise:1;
+ u16 __attribute__ ((packed)) PTK_Replay_Counter:2;
+ u16 __attribute__ ((packed)) GTK_Replay_Counter:2;
+ u16 __attribute__ ((packed)) Reserved1:2;
+ u16 __attribute__ ((packed)) Reserved2:8; /* 20051201 */
+ } __attribute__ ((packed)) RSN_Capability;
#endif
- }__attribute__ ((packed)) ;
-}__attribute__ ((packed)) ;
+ } __attribute__ ((packed)) ;
+} __attribute__ ((packed)) ;
#ifdef _WPA2_
-struct pmkid
-{
+struct pmkid {
u8 pValue[16];
};
-struct WPA2_RSN_Information_Element
-{
+struct WPA2_RSN_Information_Element {
u8 Element_ID;
u8 Length;
u16 Version;
@@ -496,27 +485,24 @@ struct WPA2_RSN_Information_Element
u16 PairwiseKeySuiteCount;
struct suite_selector PairwiseKeySuite[1];
-}__attribute__ ((packed));
+} __attribute__ ((packed));
-struct WPA2_RSN_Auth_Sub_Information_Element
-{
+struct WPA2_RSN_Auth_Sub_Information_Element {
u16 AuthKeyMngtSuiteCount;
struct suite_selector AuthKeyMngtSuite[1];
-}__attribute__ ((packed));
+} __attribute__ ((packed));
-struct PMKID_Information_Element
-{
+struct PMKID_Information_Element {
u16 PMKID_Count;
struct pmkid pmkid[16];
-}__attribute__ ((packed));
+} __attribute__ ((packed));
#endif /* enddef _WPA2_ */
/*============================================================
// MAC Frame structure (different type) and subfield structure
//============================================================*/
-struct MAC_frame_control
-{
+struct MAC_frame_control {
u8 mac_frame_info; /* a combination of the [Protocol Version, Control Type, Control Subtype]*/
#ifdef _BIG_ENDIAN_ /* 20060927 add by anson's endian */
u8 order:1;
--
1.7.0.4
next reply other threads:[~2010-05-26 23:40 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-26 23:39 Mike Sheldon [this message]
2010-05-26 23:39 ` [PATCH 02/15] Staging: winbond: Replace C99 comments with C88 Mike Sheldon
2010-05-26 23:39 ` [PATCH 03/15] Staging: winbond: Fix spacing around brackets, braces, etc Mike Sheldon
2010-05-26 23:39 ` [PATCH 04/15] Staging: winbond: Replace printk usage with pr_info/pr_err Mike Sheldon
2010-05-26 23:39 ` [PATCH 05/15] Staging: winbond: Fix spacing around brackets, braces, etc Mike Sheldon
2010-05-26 23:39 ` [PATCH 06/15] Staging: winbond: Replace C99 comments with C88 Mike Sheldon
2010-05-26 23:39 ` [PATCH 07/15] Staging: winbond: Replace printk usage with pr_err Mike Sheldon
2010-05-26 23:39 ` [PATCH 08/15] Staging: winbond: Replace printk usage with pr_info/pr_err Mike Sheldon
2010-05-26 23:39 ` [PATCH 09/15] Staging: winbond: Fix spacing around brackets and pointers Mike Sheldon
2010-05-26 23:39 ` [PATCH 10/15] Staging: winbond: Replace C99 comments with C88 Mike Sheldon
2010-05-26 23:39 ` [PATCH 11/15] Staging: winbond: Fix spacing around brackets and pointers Mike Sheldon
2010-05-26 23:39 ` [PATCH 12/15] Staging: winbond: Replace C99 comments with C88 Mike Sheldon
2010-05-26 23:39 ` [PATCH 13/15] Staging: winbond: Replace printk usage with pr_info/pr_err Mike Sheldon
2010-05-26 23:39 ` [PATCH 14/15] Staging: winbond: Replace printk usage with pr_info Mike Sheldon
2010-05-26 23:39 ` [PATCH 15/15] " Mike Sheldon
2010-06-18 17:03 ` [PATCH 01/15] Staging: winbond: Fix spacing around brackets and colons Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1274917192-16962-1-git-send-email-mike@mikeasoft.com \
--to=mike@mikeasoft.com \
--cc=devel@driverdev.osuosl.org \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=pavel@ucw.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®