diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-06-02 14:10:09 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-06-03 06:18:23 -0400 |
commit | ba2d3587912f82d1ab4367975b1df460db60fb1e (patch) | |
tree | 1e4e04caf23274bb4e39edbfc5713b4856326953 /drivers/net/wireless/airo.c | |
parent | 1273d97674a1782ff55b823aa6c40aea9b538aaf (diff) |
drivers/net: use __packed annotation
cleanup patch.
Use new __packed annotation in drivers/net/
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/airo.c')
-rw-r--r-- | drivers/net/wireless/airo.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index 3b7ab20a5c54..6b605df8a923 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c | |||
@@ -506,20 +506,20 @@ struct WepKeyRid { | |||
506 | u8 mac[ETH_ALEN]; | 506 | u8 mac[ETH_ALEN]; |
507 | __le16 klen; | 507 | __le16 klen; |
508 | u8 key[16]; | 508 | u8 key[16]; |
509 | } __attribute__ ((packed)); | 509 | } __packed; |
510 | 510 | ||
511 | /* These structures are from the Aironet's PC4500 Developers Manual */ | 511 | /* These structures are from the Aironet's PC4500 Developers Manual */ |
512 | typedef struct Ssid Ssid; | 512 | typedef struct Ssid Ssid; |
513 | struct Ssid { | 513 | struct Ssid { |
514 | __le16 len; | 514 | __le16 len; |
515 | u8 ssid[32]; | 515 | u8 ssid[32]; |
516 | } __attribute__ ((packed)); | 516 | } __packed; |
517 | 517 | ||
518 | typedef struct SsidRid SsidRid; | 518 | typedef struct SsidRid SsidRid; |
519 | struct SsidRid { | 519 | struct SsidRid { |
520 | __le16 len; | 520 | __le16 len; |
521 | Ssid ssids[3]; | 521 | Ssid ssids[3]; |
522 | } __attribute__ ((packed)); | 522 | } __packed; |
523 | 523 | ||
524 | typedef struct ModulationRid ModulationRid; | 524 | typedef struct ModulationRid ModulationRid; |
525 | struct ModulationRid { | 525 | struct ModulationRid { |
@@ -528,7 +528,7 @@ struct ModulationRid { | |||
528 | #define MOD_DEFAULT cpu_to_le16(0) | 528 | #define MOD_DEFAULT cpu_to_le16(0) |
529 | #define MOD_CCK cpu_to_le16(1) | 529 | #define MOD_CCK cpu_to_le16(1) |
530 | #define MOD_MOK cpu_to_le16(2) | 530 | #define MOD_MOK cpu_to_le16(2) |
531 | } __attribute__ ((packed)); | 531 | } __packed; |
532 | 532 | ||
533 | typedef struct ConfigRid ConfigRid; | 533 | typedef struct ConfigRid ConfigRid; |
534 | struct ConfigRid { | 534 | struct ConfigRid { |
@@ -652,7 +652,7 @@ struct ConfigRid { | |||
652 | #define MAGIC_STAY_IN_CAM (1<<10) | 652 | #define MAGIC_STAY_IN_CAM (1<<10) |
653 | u8 magicControl; | 653 | u8 magicControl; |
654 | __le16 autoWake; | 654 | __le16 autoWake; |
655 | } __attribute__ ((packed)); | 655 | } __packed; |
656 | 656 | ||
657 | typedef struct StatusRid StatusRid; | 657 | typedef struct StatusRid StatusRid; |
658 | struct StatusRid { | 658 | struct StatusRid { |
@@ -711,20 +711,20 @@ struct StatusRid { | |||
711 | #define STAT_LEAPFAILED 91 | 711 | #define STAT_LEAPFAILED 91 |
712 | #define STAT_LEAPTIMEDOUT 92 | 712 | #define STAT_LEAPTIMEDOUT 92 |
713 | #define STAT_LEAPCOMPLETE 93 | 713 | #define STAT_LEAPCOMPLETE 93 |
714 | } __attribute__ ((packed)); | 714 | } __packed; |
715 | 715 | ||
716 | typedef struct StatsRid StatsRid; | 716 | typedef struct StatsRid StatsRid; |
717 | struct StatsRid { | 717 | struct StatsRid { |
718 | __le16 len; | 718 | __le16 len; |
719 | __le16 spacer; | 719 | __le16 spacer; |
720 | __le32 vals[100]; | 720 | __le32 vals[100]; |
721 | } __attribute__ ((packed)); | 721 | } __packed; |
722 | 722 | ||
723 | typedef struct APListRid APListRid; | 723 | typedef struct APListRid APListRid; |
724 | struct APListRid { | 724 | struct APListRid { |
725 | __le16 len; | 725 | __le16 len; |
726 | u8 ap[4][ETH_ALEN]; | 726 | u8 ap[4][ETH_ALEN]; |
727 | } __attribute__ ((packed)); | 727 | } __packed; |
728 | 728 | ||
729 | typedef struct CapabilityRid CapabilityRid; | 729 | typedef struct CapabilityRid CapabilityRid; |
730 | struct CapabilityRid { | 730 | struct CapabilityRid { |
@@ -754,7 +754,7 @@ struct CapabilityRid { | |||
754 | __le16 bootBlockVer; | 754 | __le16 bootBlockVer; |
755 | __le16 requiredHard; | 755 | __le16 requiredHard; |
756 | __le16 extSoftCap; | 756 | __le16 extSoftCap; |
757 | } __attribute__ ((packed)); | 757 | } __packed; |
758 | 758 | ||
759 | /* Only present on firmware >= 5.30.17 */ | 759 | /* Only present on firmware >= 5.30.17 */ |
760 | typedef struct BSSListRidExtra BSSListRidExtra; | 760 | typedef struct BSSListRidExtra BSSListRidExtra; |
@@ -762,7 +762,7 @@ struct BSSListRidExtra { | |||
762 | __le16 unknown[4]; | 762 | __le16 unknown[4]; |
763 | u8 fixed[12]; /* WLAN management frame */ | 763 | u8 fixed[12]; /* WLAN management frame */ |
764 | u8 iep[624]; | 764 | u8 iep[624]; |
765 | } __attribute__ ((packed)); | 765 | } __packed; |
766 | 766 | ||
767 | typedef struct BSSListRid BSSListRid; | 767 | typedef struct BSSListRid BSSListRid; |
768 | struct BSSListRid { | 768 | struct BSSListRid { |
@@ -796,7 +796,7 @@ struct BSSListRid { | |||
796 | 796 | ||
797 | /* Only present on firmware >= 5.30.17 */ | 797 | /* Only present on firmware >= 5.30.17 */ |
798 | BSSListRidExtra extra; | 798 | BSSListRidExtra extra; |
799 | } __attribute__ ((packed)); | 799 | } __packed; |
800 | 800 | ||
801 | typedef struct { | 801 | typedef struct { |
802 | BSSListRid bss; | 802 | BSSListRid bss; |
@@ -807,13 +807,13 @@ typedef struct tdsRssiEntry tdsRssiEntry; | |||
807 | struct tdsRssiEntry { | 807 | struct tdsRssiEntry { |
808 | u8 rssipct; | 808 | u8 rssipct; |
809 | u8 rssidBm; | 809 | u8 rssidBm; |
810 | } __attribute__ ((packed)); | 810 | } __packed; |
811 | 811 | ||
812 | typedef struct tdsRssiRid tdsRssiRid; | 812 | typedef struct tdsRssiRid tdsRssiRid; |
813 | struct tdsRssiRid { | 813 | struct tdsRssiRid { |
814 | u16 len; | 814 | u16 len; |
815 | tdsRssiEntry x[256]; | 815 | tdsRssiEntry x[256]; |
816 | } __attribute__ ((packed)); | 816 | } __packed; |
817 | 817 | ||
818 | typedef struct MICRid MICRid; | 818 | typedef struct MICRid MICRid; |
819 | struct MICRid { | 819 | struct MICRid { |
@@ -823,7 +823,7 @@ struct MICRid { | |||
823 | u8 multicast[16]; | 823 | u8 multicast[16]; |
824 | __le16 unicastValid; | 824 | __le16 unicastValid; |
825 | u8 unicast[16]; | 825 | u8 unicast[16]; |
826 | } __attribute__ ((packed)); | 826 | } __packed; |
827 | 827 | ||
828 | typedef struct MICBuffer MICBuffer; | 828 | typedef struct MICBuffer MICBuffer; |
829 | struct MICBuffer { | 829 | struct MICBuffer { |
@@ -841,7 +841,7 @@ struct MICBuffer { | |||
841 | } u; | 841 | } u; |
842 | __be32 mic; | 842 | __be32 mic; |
843 | __be32 seq; | 843 | __be32 seq; |
844 | } __attribute__ ((packed)); | 844 | } __packed; |
845 | 845 | ||
846 | typedef struct { | 846 | typedef struct { |
847 | u8 da[ETH_ALEN]; | 847 | u8 da[ETH_ALEN]; |
@@ -996,7 +996,7 @@ struct rx_hdr { | |||
996 | u8 rate; | 996 | u8 rate; |
997 | u8 freq; | 997 | u8 freq; |
998 | __le16 tmp[4]; | 998 | __le16 tmp[4]; |
999 | } __attribute__ ((packed)); | 999 | } __packed; |
1000 | 1000 | ||
1001 | typedef struct { | 1001 | typedef struct { |
1002 | unsigned int ctl: 15; | 1002 | unsigned int ctl: 15; |