diff options
author | Gulsah Kose <gulsah.1004@gmail.com> | 2014-03-19 04:17:18 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-19 12:27:39 -0400 |
commit | 5f830a520a53a7a9febe61070c692072baf4b9c2 (patch) | |
tree | 09473b1d3e13404ce32685078bbef1fd16786d0a | |
parent | 07c452d4b9b9463a15a58948c88c291f381459ca (diff) |
staging: winbond: Fix line over 80 characters.
Fix checkpatch.pl issues with line over 80 characters in localpara.h
Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/winbond/localpara.h | 84 |
1 files changed, 64 insertions, 20 deletions
diff --git a/drivers/staging/winbond/localpara.h b/drivers/staging/winbond/localpara.h index 84effc47d79d..8ca80ddda59a 100644 --- a/drivers/staging/winbond/localpara.h +++ b/drivers/staging/winbond/localpara.h | |||
@@ -58,9 +58,13 @@ | |||
58 | #define LOCAL_11B_BASIC_RATE_BITMAP 0x826 | 58 | #define LOCAL_11B_BASIC_RATE_BITMAP 0x826 |
59 | #define LOCAL_11B_OPERATION_RATE_BITMAP 0x826 | 59 | #define LOCAL_11B_OPERATION_RATE_BITMAP 0x826 |
60 | #define LOCAL_11G_BASIC_RATE_BITMAP 0x826 /* 1, 2, 5.5, 11 */ | 60 | #define LOCAL_11G_BASIC_RATE_BITMAP 0x826 /* 1, 2, 5.5, 11 */ |
61 | #define LOCAL_11G_OPERATION_RATE_BITMAP 0x130c1240 /* 6, 9, 12, 18, 24, 36, 48, 54 */ | 61 | #define LOCAL_11G_OPERATION_RATE_BITMAP 0x130c1240 /* 6, 9, 12, 18, |
62 | * 24, 36, 48, 54 | ||
63 | */ | ||
62 | #define LOCAL_11A_BASIC_RATE_BITMAP 0x01001040 /* 6, 12, 24 */ | 64 | #define LOCAL_11A_BASIC_RATE_BITMAP 0x01001040 /* 6, 12, 24 */ |
63 | #define LOCAL_11A_OPERATION_RATE_BITMAP 0x120c0200 /* 9, 18, 36, 48, 54 */ | 65 | #define LOCAL_11A_OPERATION_RATE_BITMAP 0x120c0200 /* 9, 18, 36, |
66 | * 48, 54 | ||
67 | */ | ||
64 | 68 | ||
65 | 69 | ||
66 | #define PWR_ACTIVE 0 | 70 | #define PWR_ACTIVE 0 |
@@ -140,7 +144,9 @@ struct wb_local_para { | |||
140 | /* Unit time count for the decision to enter PS mode */ | 144 | /* Unit time count for the decision to enter PS mode */ |
141 | u16 CheckCountForPS; | 145 | u16 CheckCountForPS; |
142 | u8 boHasTxActivity;/* tx activity has occurred */ | 146 | u8 boHasTxActivity;/* tx activity has occurred */ |
143 | u8 boMacPsValid; /* Power save mode obtained from H/W is valid or not */ | 147 | u8 boMacPsValid; /* Power save mode obtained |
148 | * from H/W is valid or not | ||
149 | */ | ||
144 | 150 | ||
145 | /* Rate */ | 151 | /* Rate */ |
146 | u8 TxRateMode; /* | 152 | u8 TxRateMode; /* |
@@ -162,35 +168,57 @@ struct wb_local_para { | |||
162 | 168 | ||
163 | u8 NumOfBRate; | 169 | u8 NumOfBRate; |
164 | u8 NumOfSRate; | 170 | u8 NumOfSRate; |
165 | u8 NumOfDsssRateInSRate; /* number of DSSS rates in supported rate set */ | 171 | u8 NumOfDsssRateInSRate; /* number of DSSS rates in |
172 | * supported rate set | ||
173 | */ | ||
166 | u8 reserved1; | 174 | u8 reserved1; |
167 | 175 | ||
168 | u32 dwBasicRateBitmap; /* bit map of basic rates */ | 176 | u32 dwBasicRateBitmap; /* bit map of basic rates */ |
169 | 177 | ||
170 | u32 dwSupportRateBitmap; /* bit map of all support rates including basic and operational rates */ | 178 | u32 dwSupportRateBitmap; /* bit map of all support rates |
179 | * including basic and operational | ||
180 | * rates | ||
181 | */ | ||
171 | 182 | ||
172 | 183 | ||
173 | /* For SME/MLME handler */ | 184 | /* For SME/MLME handler */ |
174 | 185 | ||
175 | u16 wOldSTAindex; /* valid when boHandover=TRUE, store old connected STA index */ | 186 | u16 wOldSTAindex; /* valid when boHandover=TRUE, |
176 | u16 wConnectedSTAindex; /* Index of peerly connected AP or IBSS in the descriptionset. */ | 187 | * store old connected STA index |
177 | u16 Association_ID; /* The Association ID in the (Re)Association Response frame. */ | 188 | */ |
178 | u16 ListenInterval; /* The listen interval when SME invoking MLME_ (Re)Associate_Request(). */ | 189 | u16 wConnectedSTAindex; /* Index of peerly connected AP or |
190 | * IBSS in the descriptionset. | ||
191 | */ | ||
192 | u16 Association_ID; /* The Association ID in the | ||
193 | * (Re)Association Response frame. | ||
194 | */ | ||
195 | u16 ListenInterval; /* The listen interval when SME invoking | ||
196 | * MLME_ (Re)Associate_Request(). | ||
197 | */ | ||
179 | 198 | ||
180 | struct radio_off RadioOffStatus; | 199 | struct radio_off RadioOffStatus; |
181 | u8 Reserved0[2]; | 200 | u8 Reserved0[2]; |
182 | u8 boMsRadioOff; /* Ndis demands to be true when set Disassoc. OID and be false when set SSID OID. */ | 201 | u8 boMsRadioOff; /* Ndis demands to be true when set |
202 | * Disassoc. OID and be false when | ||
203 | * set SSID OID. | ||
204 | */ | ||
183 | u8 bAntennaNo; /* which antenna */ | 205 | u8 bAntennaNo; /* which antenna */ |
184 | u8 bConnectFlag; /* the connect status flag for roaming task */ | 206 | u8 bConnectFlag; /* the connect status flag for |
207 | * roaming task | ||
208 | */ | ||
185 | 209 | ||
186 | u8 RoamStatus; | 210 | u8 RoamStatus; |
187 | u8 reserved7[3]; | 211 | u8 reserved7[3]; |
188 | 212 | ||
189 | struct chan_info CurrentChan; /* Current channel no. and channel band. It may be changed by scanning. */ | 213 | struct chan_info CurrentChan; /* Current channel no. and channel band. |
214 | * It may be changed by scanning. | ||
215 | */ | ||
190 | u8 boHandover; /* Roaming, Handover to other AP. */ | 216 | u8 boHandover; /* Roaming, Handover to other AP. */ |
191 | u8 boCCAbusy; | 217 | u8 boCCAbusy; |
192 | 218 | ||
193 | u16 CWMax; /* It may not be the real value that H/W used */ | 219 | u16 CWMax; /* It may not be the real value |
220 | * that H/W used | ||
221 | */ | ||
194 | u8 CWMin; /* 255: set according to 802.11 spec. */ | 222 | u8 CWMin; /* 255: set according to 802.11 spec. */ |
195 | u8 reserved2; | 223 | u8 reserved2; |
196 | 224 | ||
@@ -200,7 +228,9 @@ struct wb_local_para { | |||
200 | u8 bPreambleMode; /* AUTO, s32 */ | 228 | u8 bPreambleMode; /* AUTO, s32 */ |
201 | u8 boNonERPpresent; | 229 | u8 boNonERPpresent; |
202 | 230 | ||
203 | u8 boProtectMechanism; /* H/W will take the necessary action based on this variable */ | 231 | u8 boProtectMechanism; /* H/W will take the necessary action |
232 | * based on this variable | ||
233 | */ | ||
204 | u8 boShortPreamble; /* Same here */ | 234 | u8 boShortPreamble; /* Same here */ |
205 | u8 boShortSlotTime; /* Same here */ | 235 | u8 boShortSlotTime; /* Same here */ |
206 | u8 reserved_3; | 236 | u8 reserved_3; |
@@ -213,8 +243,12 @@ struct wb_local_para { | |||
213 | u32 HwBssidValid; | 243 | u32 HwBssidValid; |
214 | 244 | ||
215 | /* For scan list */ | 245 | /* For scan list */ |
216 | u8 BssListCount; /* Total count of valid descriptor indexes */ | 246 | u8 BssListCount; /* Total count of valid |
217 | u8 boReceiveUncorrectInfo; /* important settings in beacon/probe resp. have been changed */ | 247 | * descriptor indexes |
248 | */ | ||
249 | u8 boReceiveUncorrectInfo; /* important settings in beacon/probe | ||
250 | * resp. have been changed | ||
251 | */ | ||
218 | u8 NoOfJoinerInIbss; | 252 | u8 NoOfJoinerInIbss; |
219 | u8 reserved_4; | 253 | u8 reserved_4; |
220 | 254 | ||
@@ -228,7 +262,9 @@ struct wb_local_para { | |||
228 | */ | 262 | */ |
229 | u8 JoinerInIbss[(MAX_BSS_DESCRIPT_ELEMENT + 3) & ~0x03]; | 263 | u8 JoinerInIbss[(MAX_BSS_DESCRIPT_ELEMENT + 3) & ~0x03]; |
230 | 264 | ||
231 | /* General Statistics, count at Rx_handler or Tx_callback interrupt handler */ | 265 | /* General Statistics, count at Rx_handler or |
266 | * Tx_callback interrupt handler | ||
267 | */ | ||
232 | u64 GS_XMIT_OK; /* Good Frames Transmitted */ | 268 | u64 GS_XMIT_OK; /* Good Frames Transmitted */ |
233 | u64 GS_RCV_OK; /* Good Frames Received */ | 269 | u64 GS_RCV_OK; /* Good Frames Received */ |
234 | u32 GS_RCV_ERROR; /* Frames received with crc error */ | 270 | u32 GS_RCV_ERROR; /* Frames received with crc error */ |
@@ -248,10 +284,18 @@ struct wb_local_para { | |||
248 | u32 _dot11WEPUndecryptableCount; | 284 | u32 _dot11WEPUndecryptableCount; |
249 | u32 _dot11FrameDuplicateCount; | 285 | u32 _dot11FrameDuplicateCount; |
250 | 286 | ||
251 | struct chan_info IbssChanSetting; /* 2B. Start IBSS Channel setting by registry or WWU. */ | 287 | struct chan_info IbssChanSetting; /* 2B. Start IBSS Channel |
252 | u8 reserved_5[2]; /* It may not be used after considering RF type, region and modulation type. */ | 288 | * setting by registry or |
289 | * WWU. | ||
290 | */ | ||
291 | u8 reserved_5[2]; /* It may not be used after | ||
292 | * considering RF type, region | ||
293 | * and modulation type. | ||
294 | */ | ||
253 | 295 | ||
254 | u8 reserved_6[2]; /* two variables are for wep key error detection */ | 296 | u8 reserved_6[2]; /* two variables are for wep |
297 | * key error detection | ||
298 | */ | ||
255 | u32 bWepKeyError; | 299 | u32 bWepKeyError; |
256 | u32 bToSelfPacketReceived; | 300 | u32 bToSelfPacketReceived; |
257 | u32 WepKeyDetectTimerCount; | 301 | u32 WepKeyDetectTimerCount; |