Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Staging: winbond: fix brace and space coding style issue in mac_structures.h

This is a patch to the mac_structures.h file that fixed up a brace and
space Errors found by the checkpatch.pl tool.

Signed-off-by: Ruslan Pisarev <ruslan@rpisarev.org.ua>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

authored by

Ruslan Pisarev and committed by
Greg Kroah-Hartman
d20279d7 03a4389c

+68 -91
+68 -91
drivers/staging/winbond/mac_structures.h
··· 180 180 // Define the transmission constants based on W89C32 MAC 181 181 // target specification. 182 182 //===========================================================*/ 183 - typedef enum enum_TxRate 184 - { 183 + typedef enum enum_TxRate { 185 184 TXRATE_1M = 0, 186 185 TXRATE_2MLONG = 2, 187 186 TXRATE_2MSHORT = 3, ··· 237 238 #define CAPABILITY_DSSS_OFDM_BIT 0x2000 238 239 239 240 240 - struct Capability_Information_Element 241 - { 242 - union 243 - { 244 - u16 __attribute__ ((packed)) wValue; 241 + struct Capability_Information_Element { 242 + union { 243 + u16 __attribute__ ((packed)) wValue; 245 244 #ifdef _BIG_ENDIAN_ /* 20060926 add by anson's endian */ 246 - struct _Capability 247 - { 248 - /* -- 11G -- */ 249 - u8 Reserved3 : 2; 250 - u8 DSSS_OFDM : 1; 251 - u8 Reserved2 : 2; 252 - u8 Short_Slot_Time : 1; 253 - u8 Reserved1 : 2; 254 - u8 Channel_Agility : 1; 255 - u8 PBCC : 1; 256 - u8 ShortPreamble : 1; 257 - u8 CF_Privacy : 1; 258 - u8 CF_Poll_Request : 1; 259 - u8 CF_Pollable : 1; 260 - u8 IBSS : 1; 261 - u8 ESS : 1; 245 + struct _Capability { 246 + /* -- 11G -- */ 247 + u8 Reserved3:2; 248 + u8 DSSS_OFDM:1; 249 + u8 Reserved2:2; 250 + u8 Short_Slot_Time:1; 251 + u8 Reserved1:2; 252 + u8 Channel_Agility:1; 253 + u8 PBCC:1; 254 + u8 ShortPreamble:1; 255 + u8 CF_Privacy:1; 256 + u8 CF_Poll_Request:1; 257 + u8 CF_Pollable:1; 258 + u8 IBSS:1; 259 + u8 ESS:1; 262 260 } __attribute__ ((packed)) Capability; 263 261 #else 264 - struct _Capability 265 - { 266 - u8 ESS : 1; 267 - u8 IBSS : 1; 268 - u8 CF_Pollable : 1; 269 - u8 CF_Poll_Request : 1; 270 - u8 CF_Privacy : 1; 271 - u8 ShortPreamble : 1; 272 - u8 PBCC : 1; 273 - u8 Channel_Agility : 1; 274 - u8 Reserved1 : 2; 262 + struct _Capability { 263 + u8 ESS:1; 264 + u8 IBSS:1; 265 + u8 CF_Pollable:1; 266 + u8 CF_Poll_Request:1; 267 + u8 CF_Privacy:1; 268 + u8 ShortPreamble:1; 269 + u8 PBCC:1; 270 + u8 Channel_Agility:1; 271 + u8 Reserved1:2; 275 272 /* -- 11G -- */ 276 - u8 Short_Slot_Time : 1; 277 - u8 Reserved2 : 2; 278 - u8 DSSS_OFDM : 1; 279 - u8 Reserved3 : 2; 273 + u8 Short_Slot_Time:1; 274 + u8 Reserved2:2; 275 + u8 DSSS_OFDM:1; 276 + u8 Reserved3:2; 280 277 } __attribute__ ((packed)) Capability; 281 278 #endif 282 - }__attribute__ ((packed)) ; 283 - }__attribute__ ((packed)); 279 + } __attribute__ ((packed)) ; 280 + } __attribute__ ((packed)); 284 281 285 - struct FH_Parameter_Set_Element 286 - { 282 + struct FH_Parameter_Set_Element { 287 283 u8 Element_ID; 288 284 u8 Length; 289 285 u8 Dwell_Time[2]; ··· 287 293 u8 Hop_Index; 288 294 }; 289 295 290 - struct DS_Parameter_Set_Element 291 - { 296 + struct DS_Parameter_Set_Element { 292 297 u8 Element_ID; 293 298 u8 Length; 294 299 u8 Current_Channel; 295 300 }; 296 301 297 - struct Supported_Rates_Element 298 - { 302 + struct Supported_Rates_Element { 299 303 u8 Element_ID; 300 304 u8 Length; 301 305 u8 SupportedRates[8]; 302 - }__attribute__ ((packed)); 306 + } __attribute__ ((packed)); 303 307 304 - struct SSID_Element 305 - { 308 + struct SSID_Element { 306 309 u8 Element_ID; 307 310 u8 Length; 308 311 u8 SSID[32]; 309 - }__attribute__ ((packed)) ; 312 + } __attribute__ ((packed)) ; 310 313 311 - struct CF_Parameter_Set_Element 312 - { 314 + struct CF_Parameter_Set_Element { 313 315 u8 Element_ID; 314 316 u8 Length; 315 317 u8 CFP_Count; ··· 314 324 u8 CFP_DurRemaining[2]; /* in time units */ 315 325 }; 316 326 317 - struct TIM_Element 318 - { 327 + struct TIM_Element { 319 328 u8 Element_ID; 320 329 u8 Length; 321 330 u8 DTIM_Count; ··· 323 334 u8 Partial_Virtual_Bitmap[251]; 324 335 }; 325 336 326 - struct IBSS_Parameter_Set_Element 327 - { 337 + struct IBSS_Parameter_Set_Element { 328 338 u8 Element_ID; 329 339 u8 Length; 330 340 u8 ATIM_Window[2]; 331 341 }; 332 342 333 - struct Challenge_Text_Element 334 - { 343 + struct Challenge_Text_Element { 335 344 u8 Element_ID; 336 345 u8 Length; 337 346 u8 Challenge_Text[253]; 338 347 }; 339 348 340 - struct PHY_Parameter_Set_Element 341 - { 349 + struct PHY_Parameter_Set_Element { 342 350 /* int aSlotTime; */ 343 351 /* int aSifsTime; */ 344 352 s32 aCCATime; ··· 358 372 }; 359 373 360 374 /* -- 11G -- */ 361 - struct ERP_Information_Element 362 - { 375 + struct ERP_Information_Element { 363 376 u8 Element_ID; 364 377 u8 Length; 365 378 #ifdef _BIG_ENDIAN_ /* 20060926 add by anson's endian */ 366 - u8 Reserved:5; /* 20060926 add by anson */ 367 - u8 Barker_Preamble_Mode:1; 379 + u8 Reserved:5; /* 20060926 add by anson */ 380 + u8 Barker_Preamble_Mode:1; 368 381 u8 Use_Protection:1; 369 382 u8 NonERP_Present:1; 370 383 #else ··· 374 389 #endif 375 390 }; 376 391 377 - struct Extended_Supported_Rates_Element 378 - { 392 + struct Extended_Supported_Rates_Element { 379 393 u8 Element_ID; 380 394 u8 Length; 381 395 u8 ExtendedSupportedRates[255]; 382 - }__attribute__ ((packed)); 396 + } __attribute__ ((packed)); 383 397 384 398 /* WPA(802.11i draft 3.0) */ 385 399 #define VERSION_WPA 1 ··· 548 564 u16 Sequence_Control; 549 565 /* Management Frame Body <= 325 bytes */ 550 566 /* FCS 4 bytes */ 551 - }__attribute__ ((packed)); 567 + } __attribute__ ((packed)); 552 568 553 569 /* SW-MAC don't Tx/Rx Control-Frame, HW-MAC do it. */ 554 570 struct Control_Frame { ··· 557 573 u8 RA[MAC_ADDR_LENGTH]; 558 574 u8 TA[MAC_ADDR_LENGTH]; 559 575 u16 FCS; 560 - }__attribute__ ((packed)); 576 + } __attribute__ ((packed)); 561 577 562 578 struct Data_Frame { 563 579 struct MAC_frame_control frame_control; ··· 569 585 u8 Addr4[MAC_ADDR_LENGTH]; /* only exist when ToDS=FromDS=1 */ 570 586 /* Data Frame Body <= 2312 */ 571 587 /* FCS */ 572 - }__attribute__ ((packed)); 588 + } __attribute__ ((packed)); 573 589 574 - struct Disassociation_Frame_Body 575 - { 590 + struct Disassociation_Frame_Body { 576 591 u16 reasonCode; 577 - }__attribute__ ((packed)); 592 + } __attribute__ ((packed)); 578 593 579 - struct Association_Request_Frame_Body 580 - { 594 + struct Association_Request_Frame_Body { 581 595 u16 capability_information; 582 596 u16 listenInterval; 583 597 u8 Current_AP_Address[MAC_ADDR_LENGTH];/* for reassociation only */ 584 598 /* SSID (2+32 bytes) */ 585 599 /* Supported_Rates (2+8 bytes) */ 586 - }__attribute__ ((packed)); 600 + } __attribute__ ((packed)); 587 601 588 - struct Association_Response_Frame_Body 589 - { 602 + struct Association_Response_Frame_Body { 590 603 u16 capability_information; 591 604 u16 statusCode; 592 605 u16 Association_ID; 593 606 struct Supported_Rates_Element supportedRates; 594 - }__attribute__ ((packed)); 607 + } __attribute__ ((packed)); 595 608 596 609 /*struct Reassociation_Request_Frame_Body 597 610 { ··· 600 619 };*/ 601 620 /* eliminated by WS 07/22/04 comboined with associateion request frame. */ 602 621 603 - struct Reassociation_Response_Frame_Body 604 - { 622 + struct Reassociation_Response_Frame_Body { 605 623 u16 capability_information; 606 624 u16 statusCode; 607 625 u16 Association_ID; 608 626 struct Supported_Rates_Element supportedRates; 609 - }__attribute__ ((packed)); 627 + } __attribute__ ((packed)); 610 628 611 - struct Deauthentication_Frame_Body 612 - { 629 + struct Deauthentication_Frame_Body { 613 630 u16 reasonCode; 614 - }__attribute__ ((packed)); 631 + } __attribute__ ((packed)); 615 632 616 633 617 - struct Probe_Response_Frame_Body 618 - { 634 + struct Probe_Response_Frame_Body { 619 635 u16 Timestamp; 620 636 u16 Beacon_Interval; 621 637 u16 Capability_Information; ··· 621 643 // PHY parameter Set (DS Parameters) 622 644 // CF parameter Set 623 645 // IBSS parameter Set */ 624 - }__attribute__ ((packed)); 646 + } __attribute__ ((packed)); 625 647 626 - struct Authentication_Frame_Body 627 - { 648 + struct Authentication_Frame_Body { 628 649 u16 algorithmNumber; 629 650 u16 sequenceNumber; 630 651 u16 statusCode; 631 652 /* NB: don't include ChallengeText in this structure 632 653 // struct Challenge_Text_Element sChallengeTextElement; // wkchen added */ 633 - }__attribute__ ((packed)); 654 + } __attribute__ ((packed)); 634 655 635 656 636 657 #endif /* _MAC_Structure_H_ */