diff options
author | Moritz Muehlenhoff <jmm@debian.org> | 2009-01-21 16:00:40 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 17:53:16 -0400 |
commit | 9cba46dc1c1c98d9e1c44be7b8d435ad553f799e (patch) | |
tree | dec26291547bbb55b4e29a6eddab8542bfd7cb91 /drivers/staging | |
parent | 4bb5a7ec7635d1b1b66f853b9a9f9b717bc6b26d (diff) |
Staging: wlan-ng: Remove use of __WLAN_ATTRIB_PACK__
Replace all ocurrances of the __WLAN_ATTRIB_PACK__ from wlan_compat.h
by __attribute__((packed)) and remove it afterwards.
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/wlan-ng/hfa384x.h | 310 | ||||
-rw-r--r-- | drivers/staging/wlan-ng/p80211conv.h | 6 | ||||
-rw-r--r-- | drivers/staging/wlan-ng/p80211hdr.h | 6 | ||||
-rw-r--r-- | drivers/staging/wlan-ng/p80211ioctl.h | 2 | ||||
-rw-r--r-- | drivers/staging/wlan-ng/p80211metastruct.h | 30 | ||||
-rw-r--r-- | drivers/staging/wlan-ng/p80211mgmt.h | 18 | ||||
-rw-r--r-- | drivers/staging/wlan-ng/p80211msg.h | 4 | ||||
-rw-r--r-- | drivers/staging/wlan-ng/p80211types.h | 34 | ||||
-rw-r--r-- | drivers/staging/wlan-ng/wlan_compat.h | 5 |
9 files changed, 205 insertions, 210 deletions
diff --git a/drivers/staging/wlan-ng/hfa384x.h b/drivers/staging/wlan-ng/hfa384x.h index 9b746654a39..f7d69e084e6 100644 --- a/drivers/staging/wlan-ng/hfa384x.h +++ b/drivers/staging/wlan-ng/hfa384x.h | |||
@@ -893,13 +893,13 @@ typedef struct hfa384x_bytestr | |||
893 | { | 893 | { |
894 | u16 len; | 894 | u16 len; |
895 | u8 data[0]; | 895 | u8 data[0]; |
896 | } __WLAN_ATTRIB_PACK__ hfa384x_bytestr_t; | 896 | } __attribute__((packed)) hfa384x_bytestr_t; |
897 | 897 | ||
898 | typedef struct hfa384x_bytestr32 | 898 | typedef struct hfa384x_bytestr32 |
899 | { | 899 | { |
900 | u16 len; | 900 | u16 len; |
901 | u8 data[32]; | 901 | u8 data[32]; |
902 | } __WLAN_ATTRIB_PACK__ hfa384x_bytestr32_t; | 902 | } __attribute__((packed)) hfa384x_bytestr32_t; |
903 | 903 | ||
904 | /*-------------------------------------------------------------------- | 904 | /*-------------------------------------------------------------------- |
905 | Configuration Record Structures: | 905 | Configuration Record Structures: |
@@ -912,21 +912,21 @@ typedef struct hfa384x_record | |||
912 | { | 912 | { |
913 | u16 reclen; | 913 | u16 reclen; |
914 | u16 rid; | 914 | u16 rid; |
915 | } __WLAN_ATTRIB_PACK__ hfa384x_rec_t; | 915 | } __attribute__((packed)) hfa384x_rec_t; |
916 | 916 | ||
917 | typedef struct hfa384x_record16 | 917 | typedef struct hfa384x_record16 |
918 | { | 918 | { |
919 | u16 reclen; | 919 | u16 reclen; |
920 | u16 rid; | 920 | u16 rid; |
921 | u16 val; | 921 | u16 val; |
922 | } __WLAN_ATTRIB_PACK__ hfa384x_rec16_t; | 922 | } __attribute__((packed)) hfa384x_rec16_t; |
923 | 923 | ||
924 | typedef struct hfa384x_record32 | 924 | typedef struct hfa384x_record32 |
925 | { | 925 | { |
926 | u16 reclen; | 926 | u16 reclen; |
927 | u16 rid; | 927 | u16 rid; |
928 | u32 val; | 928 | u32 val; |
929 | } __WLAN_ATTRIB_PACK__ hfa384x_rec32; | 929 | } __attribute__((packed)) hfa384x_rec32; |
930 | 930 | ||
931 | /*-- Hardware/Firmware Component Information ----------*/ | 931 | /*-- Hardware/Firmware Component Information ----------*/ |
932 | typedef struct hfa384x_compident | 932 | typedef struct hfa384x_compident |
@@ -935,7 +935,7 @@ typedef struct hfa384x_compident | |||
935 | u16 variant; | 935 | u16 variant; |
936 | u16 major; | 936 | u16 major; |
937 | u16 minor; | 937 | u16 minor; |
938 | } __WLAN_ATTRIB_PACK__ hfa384x_compident_t; | 938 | } __attribute__((packed)) hfa384x_compident_t; |
939 | 939 | ||
940 | typedef struct hfa384x_caplevel | 940 | typedef struct hfa384x_caplevel |
941 | { | 941 | { |
@@ -944,79 +944,79 @@ typedef struct hfa384x_caplevel | |||
944 | u16 variant; | 944 | u16 variant; |
945 | u16 bottom; | 945 | u16 bottom; |
946 | u16 top; | 946 | u16 top; |
947 | } __WLAN_ATTRIB_PACK__ hfa384x_caplevel_t; | 947 | } __attribute__((packed)) hfa384x_caplevel_t; |
948 | 948 | ||
949 | /*-- Configuration Record: cnfPortType --*/ | 949 | /*-- Configuration Record: cnfPortType --*/ |
950 | typedef struct hfa384x_cnfPortType | 950 | typedef struct hfa384x_cnfPortType |
951 | { | 951 | { |
952 | u16 cnfPortType; | 952 | u16 cnfPortType; |
953 | } __WLAN_ATTRIB_PACK__ hfa384x_cnfPortType_t; | 953 | } __attribute__((packed)) hfa384x_cnfPortType_t; |
954 | 954 | ||
955 | /*-- Configuration Record: cnfOwnMACAddress --*/ | 955 | /*-- Configuration Record: cnfOwnMACAddress --*/ |
956 | typedef struct hfa384x_cnfOwnMACAddress | 956 | typedef struct hfa384x_cnfOwnMACAddress |
957 | { | 957 | { |
958 | u8 cnfOwnMACAddress[6]; | 958 | u8 cnfOwnMACAddress[6]; |
959 | } __WLAN_ATTRIB_PACK__ hfa384x_cnfOwnMACAddress_t; | 959 | } __attribute__((packed)) hfa384x_cnfOwnMACAddress_t; |
960 | 960 | ||
961 | /*-- Configuration Record: cnfDesiredSSID --*/ | 961 | /*-- Configuration Record: cnfDesiredSSID --*/ |
962 | typedef struct hfa384x_cnfDesiredSSID | 962 | typedef struct hfa384x_cnfDesiredSSID |
963 | { | 963 | { |
964 | u8 cnfDesiredSSID[34]; | 964 | u8 cnfDesiredSSID[34]; |
965 | } __WLAN_ATTRIB_PACK__ hfa384x_cnfDesiredSSID_t; | 965 | } __attribute__((packed)) hfa384x_cnfDesiredSSID_t; |
966 | 966 | ||
967 | /*-- Configuration Record: cnfOwnChannel --*/ | 967 | /*-- Configuration Record: cnfOwnChannel --*/ |
968 | typedef struct hfa384x_cnfOwnChannel | 968 | typedef struct hfa384x_cnfOwnChannel |
969 | { | 969 | { |
970 | u16 cnfOwnChannel; | 970 | u16 cnfOwnChannel; |
971 | } __WLAN_ATTRIB_PACK__ hfa384x_cnfOwnChannel_t; | 971 | } __attribute__((packed)) hfa384x_cnfOwnChannel_t; |
972 | 972 | ||
973 | /*-- Configuration Record: cnfOwnSSID --*/ | 973 | /*-- Configuration Record: cnfOwnSSID --*/ |
974 | typedef struct hfa384x_cnfOwnSSID | 974 | typedef struct hfa384x_cnfOwnSSID |
975 | { | 975 | { |
976 | u8 cnfOwnSSID[34]; | 976 | u8 cnfOwnSSID[34]; |
977 | } __WLAN_ATTRIB_PACK__ hfa384x_cnfOwnSSID_t; | 977 | } __attribute__((packed)) hfa384x_cnfOwnSSID_t; |
978 | 978 | ||
979 | /*-- Configuration Record: cnfOwnATIMWindow --*/ | 979 | /*-- Configuration Record: cnfOwnATIMWindow --*/ |
980 | typedef struct hfa384x_cnfOwnATIMWindow | 980 | typedef struct hfa384x_cnfOwnATIMWindow |
981 | { | 981 | { |
982 | u16 cnfOwnATIMWindow; | 982 | u16 cnfOwnATIMWindow; |
983 | } __WLAN_ATTRIB_PACK__ hfa384x_cnfOwnATIMWindow_t; | 983 | } __attribute__((packed)) hfa384x_cnfOwnATIMWindow_t; |
984 | 984 | ||
985 | /*-- Configuration Record: cnfSystemScale --*/ | 985 | /*-- Configuration Record: cnfSystemScale --*/ |
986 | typedef struct hfa384x_cnfSystemScale | 986 | typedef struct hfa384x_cnfSystemScale |
987 | { | 987 | { |
988 | u16 cnfSystemScale; | 988 | u16 cnfSystemScale; |
989 | } __WLAN_ATTRIB_PACK__ hfa384x_cnfSystemScale_t; | 989 | } __attribute__((packed)) hfa384x_cnfSystemScale_t; |
990 | 990 | ||
991 | /*-- Configuration Record: cnfMaxDataLength --*/ | 991 | /*-- Configuration Record: cnfMaxDataLength --*/ |
992 | typedef struct hfa384x_cnfMaxDataLength | 992 | typedef struct hfa384x_cnfMaxDataLength |
993 | { | 993 | { |
994 | u16 cnfMaxDataLength; | 994 | u16 cnfMaxDataLength; |
995 | } __WLAN_ATTRIB_PACK__ hfa384x_cnfMaxDataLength_t; | 995 | } __attribute__((packed)) hfa384x_cnfMaxDataLength_t; |
996 | 996 | ||
997 | /*-- Configuration Record: cnfWDSAddress --*/ | 997 | /*-- Configuration Record: cnfWDSAddress --*/ |
998 | typedef struct hfa384x_cnfWDSAddress | 998 | typedef struct hfa384x_cnfWDSAddress |
999 | { | 999 | { |
1000 | u8 cnfWDSAddress[6]; | 1000 | u8 cnfWDSAddress[6]; |
1001 | } __WLAN_ATTRIB_PACK__ hfa384x_cnfWDSAddress_t; | 1001 | } __attribute__((packed)) hfa384x_cnfWDSAddress_t; |
1002 | 1002 | ||
1003 | /*-- Configuration Record: cnfPMEnabled --*/ | 1003 | /*-- Configuration Record: cnfPMEnabled --*/ |
1004 | typedef struct hfa384x_cnfPMEnabled | 1004 | typedef struct hfa384x_cnfPMEnabled |
1005 | { | 1005 | { |
1006 | u16 cnfPMEnabled; | 1006 | u16 cnfPMEnabled; |
1007 | } __WLAN_ATTRIB_PACK__ hfa384x_cnfPMEnabled_t; | 1007 | } __attribute__((packed)) hfa384x_cnfPMEnabled_t; |
1008 | 1008 | ||
1009 | /*-- Configuration Record: cnfPMEPS --*/ | 1009 | /*-- Configuration Record: cnfPMEPS --*/ |
1010 | typedef struct hfa384x_cnfPMEPS | 1010 | typedef struct hfa384x_cnfPMEPS |
1011 | { | 1011 | { |
1012 | u16 cnfPMEPS; | 1012 | u16 cnfPMEPS; |
1013 | } __WLAN_ATTRIB_PACK__ hfa384x_cnfPMEPS_t; | 1013 | } __attribute__((packed)) hfa384x_cnfPMEPS_t; |
1014 | 1014 | ||
1015 | /*-- Configuration Record: cnfMulticastReceive --*/ | 1015 | /*-- Configuration Record: cnfMulticastReceive --*/ |
1016 | typedef struct hfa384x_cnfMulticastReceive | 1016 | typedef struct hfa384x_cnfMulticastReceive |
1017 | { | 1017 | { |
1018 | u16 cnfMulticastReceive; | 1018 | u16 cnfMulticastReceive; |
1019 | } __WLAN_ATTRIB_PACK__ hfa384x_cnfMulticastReceive_t; | 1019 | } __attribute__((packed)) hfa384x_cnfMulticastReceive_t; |
1020 | 1020 | ||
1021 | /*-- Configuration Record: cnfAuthentication --*/ | 1021 | /*-- Configuration Record: cnfAuthentication --*/ |
1022 | #define HFA384x_CNFAUTHENTICATION_OPENSYSTEM 0x0001 | 1022 | #define HFA384x_CNFAUTHENTICATION_OPENSYSTEM 0x0001 |
@@ -1027,37 +1027,37 @@ typedef struct hfa384x_cnfMulticastReceive | |||
1027 | typedef struct hfa384x_cnfMaxSleepDuration | 1027 | typedef struct hfa384x_cnfMaxSleepDuration |
1028 | { | 1028 | { |
1029 | u16 cnfMaxSleepDuration; | 1029 | u16 cnfMaxSleepDuration; |
1030 | } __WLAN_ATTRIB_PACK__ hfa384x_cnfMaxSleepDuration_t; | 1030 | } __attribute__((packed)) hfa384x_cnfMaxSleepDuration_t; |
1031 | 1031 | ||
1032 | /*-- Configuration Record: cnfPMHoldoverDuration --*/ | 1032 | /*-- Configuration Record: cnfPMHoldoverDuration --*/ |
1033 | typedef struct hfa384x_cnfPMHoldoverDuration | 1033 | typedef struct hfa384x_cnfPMHoldoverDuration |
1034 | { | 1034 | { |
1035 | u16 cnfPMHoldoverDuration; | 1035 | u16 cnfPMHoldoverDuration; |
1036 | } __WLAN_ATTRIB_PACK__ hfa384x_cnfPMHoldoverDuration_t; | 1036 | } __attribute__((packed)) hfa384x_cnfPMHoldoverDuration_t; |
1037 | 1037 | ||
1038 | /*-- Configuration Record: cnfOwnName --*/ | 1038 | /*-- Configuration Record: cnfOwnName --*/ |
1039 | typedef struct hfa384x_cnfOwnName | 1039 | typedef struct hfa384x_cnfOwnName |
1040 | { | 1040 | { |
1041 | u8 cnfOwnName[34]; | 1041 | u8 cnfOwnName[34]; |
1042 | } __WLAN_ATTRIB_PACK__ hfa384x_cnfOwnName_t; | 1042 | } __attribute__((packed)) hfa384x_cnfOwnName_t; |
1043 | 1043 | ||
1044 | /*-- Configuration Record: cnfOwnDTIMPeriod --*/ | 1044 | /*-- Configuration Record: cnfOwnDTIMPeriod --*/ |
1045 | typedef struct hfa384x_cnfOwnDTIMPeriod | 1045 | typedef struct hfa384x_cnfOwnDTIMPeriod |
1046 | { | 1046 | { |
1047 | u16 cnfOwnDTIMPeriod; | 1047 | u16 cnfOwnDTIMPeriod; |
1048 | } __WLAN_ATTRIB_PACK__ hfa384x_cnfOwnDTIMPeriod_t; | 1048 | } __attribute__((packed)) hfa384x_cnfOwnDTIMPeriod_t; |
1049 | 1049 | ||
1050 | /*-- Configuration Record: cnfWDSAddress --*/ | 1050 | /*-- Configuration Record: cnfWDSAddress --*/ |
1051 | typedef struct hfa384x_cnfWDSAddressN | 1051 | typedef struct hfa384x_cnfWDSAddressN |
1052 | { | 1052 | { |
1053 | u8 cnfWDSAddress[6]; | 1053 | u8 cnfWDSAddress[6]; |
1054 | } __WLAN_ATTRIB_PACK__ hfa384x_cnfWDSAddressN_t; | 1054 | } __attribute__((packed)) hfa384x_cnfWDSAddressN_t; |
1055 | 1055 | ||
1056 | /*-- Configuration Record: cnfMulticastPMBuffering --*/ | 1056 | /*-- Configuration Record: cnfMulticastPMBuffering --*/ |
1057 | typedef struct hfa384x_cnfMulticastPMBuffering | 1057 | typedef struct hfa384x_cnfMulticastPMBuffering |
1058 | { | 1058 | { |
1059 | u16 cnfMulticastPMBuffering; | 1059 | u16 cnfMulticastPMBuffering; |
1060 | } __WLAN_ATTRIB_PACK__ hfa384x_cnfMulticastPMBuffering_t; | 1060 | } __attribute__((packed)) hfa384x_cnfMulticastPMBuffering_t; |
1061 | 1061 | ||
1062 | /*-------------------------------------------------------------------- | 1062 | /*-------------------------------------------------------------------- |
1063 | Configuration Record Structures: | 1063 | Configuration Record Structures: |
@@ -1068,13 +1068,13 @@ Configuration Record Structures: | |||
1068 | typedef struct hfa384x_GroupAddresses | 1068 | typedef struct hfa384x_GroupAddresses |
1069 | { | 1069 | { |
1070 | u8 MACAddress[16][6]; | 1070 | u8 MACAddress[16][6]; |
1071 | } __WLAN_ATTRIB_PACK__ hfa384x_GroupAddresses_t; | 1071 | } __attribute__((packed)) hfa384x_GroupAddresses_t; |
1072 | 1072 | ||
1073 | /*-- Configuration Record: CreateIBSS --*/ | 1073 | /*-- Configuration Record: CreateIBSS --*/ |
1074 | typedef struct hfa384x_CreateIBSS | 1074 | typedef struct hfa384x_CreateIBSS |
1075 | { | 1075 | { |
1076 | u16 CreateIBSS; | 1076 | u16 CreateIBSS; |
1077 | } __WLAN_ATTRIB_PACK__ hfa384x_CreateIBSS_t; | 1077 | } __attribute__((packed)) hfa384x_CreateIBSS_t; |
1078 | 1078 | ||
1079 | #define HFA384x_CREATEIBSS_JOINCREATEIBSS 0 | 1079 | #define HFA384x_CREATEIBSS_JOINCREATEIBSS 0 |
1080 | #define HFA384x_CREATEIBSS_JOINESS_JOINCREATEIBSS 1 | 1080 | #define HFA384x_CREATEIBSS_JOINESS_JOINCREATEIBSS 1 |
@@ -1085,32 +1085,32 @@ typedef struct hfa384x_CreateIBSS | |||
1085 | typedef struct hfa384x_FragmentationThreshold | 1085 | typedef struct hfa384x_FragmentationThreshold |
1086 | { | 1086 | { |
1087 | u16 FragmentationThreshold; | 1087 | u16 FragmentationThreshold; |
1088 | } __WLAN_ATTRIB_PACK__ hfa384x_FragmentationThreshold_t; | 1088 | } __attribute__((packed)) hfa384x_FragmentationThreshold_t; |
1089 | 1089 | ||
1090 | /*-- Configuration Record: RTSThreshold --*/ | 1090 | /*-- Configuration Record: RTSThreshold --*/ |
1091 | typedef struct hfa384x_RTSThreshold | 1091 | typedef struct hfa384x_RTSThreshold |
1092 | { | 1092 | { |
1093 | u16 RTSThreshold; | 1093 | u16 RTSThreshold; |
1094 | } __WLAN_ATTRIB_PACK__ hfa384x_RTSThreshold_t; | 1094 | } __attribute__((packed)) hfa384x_RTSThreshold_t; |
1095 | 1095 | ||
1096 | /*-- Configuration Record: TxRateControl --*/ | 1096 | /*-- Configuration Record: TxRateControl --*/ |
1097 | typedef struct hfa384x_TxRateControl | 1097 | typedef struct hfa384x_TxRateControl |
1098 | { | 1098 | { |
1099 | u16 TxRateControl; | 1099 | u16 TxRateControl; |
1100 | } __WLAN_ATTRIB_PACK__ hfa384x_TxRateControl_t; | 1100 | } __attribute__((packed)) hfa384x_TxRateControl_t; |
1101 | 1101 | ||
1102 | /*-- Configuration Record: PromiscuousMode --*/ | 1102 | /*-- Configuration Record: PromiscuousMode --*/ |
1103 | typedef struct hfa384x_PromiscuousMode | 1103 | typedef struct hfa384x_PromiscuousMode |
1104 | { | 1104 | { |
1105 | u16 PromiscuousMode; | 1105 | u16 PromiscuousMode; |
1106 | } __WLAN_ATTRIB_PACK__ hfa384x_PromiscuousMode_t; | 1106 | } __attribute__((packed)) hfa384x_PromiscuousMode_t; |
1107 | 1107 | ||
1108 | /*-- Configuration Record: ScanRequest (data portion only) --*/ | 1108 | /*-- Configuration Record: ScanRequest (data portion only) --*/ |
1109 | typedef struct hfa384x_ScanRequest_data | 1109 | typedef struct hfa384x_ScanRequest_data |
1110 | { | 1110 | { |
1111 | u16 channelList; | 1111 | u16 channelList; |
1112 | u16 txRate; | 1112 | u16 txRate; |
1113 | } __WLAN_ATTRIB_PACK__ hfa384x_ScanRequest_data_t; | 1113 | } __attribute__((packed)) hfa384x_ScanRequest_data_t; |
1114 | 1114 | ||
1115 | /*-- Configuration Record: HostScanRequest (data portion only) --*/ | 1115 | /*-- Configuration Record: HostScanRequest (data portion only) --*/ |
1116 | typedef struct hfa384x_HostScanRequest_data | 1116 | typedef struct hfa384x_HostScanRequest_data |
@@ -1118,14 +1118,14 @@ typedef struct hfa384x_HostScanRequest_data | |||
1118 | u16 channelList; | 1118 | u16 channelList; |
1119 | u16 txRate; | 1119 | u16 txRate; |
1120 | hfa384x_bytestr32_t ssid; | 1120 | hfa384x_bytestr32_t ssid; |
1121 | } __WLAN_ATTRIB_PACK__ hfa384x_HostScanRequest_data_t; | 1121 | } __attribute__((packed)) hfa384x_HostScanRequest_data_t; |
1122 | 1122 | ||
1123 | /*-- Configuration Record: JoinRequest (data portion only) --*/ | 1123 | /*-- Configuration Record: JoinRequest (data portion only) --*/ |
1124 | typedef struct hfa384x_JoinRequest_data | 1124 | typedef struct hfa384x_JoinRequest_data |
1125 | { | 1125 | { |
1126 | u8 bssid[WLAN_BSSID_LEN]; | 1126 | u8 bssid[WLAN_BSSID_LEN]; |
1127 | u16 channel; | 1127 | u16 channel; |
1128 | } __WLAN_ATTRIB_PACK__ hfa384x_JoinRequest_data_t; | 1128 | } __attribute__((packed)) hfa384x_JoinRequest_data_t; |
1129 | 1129 | ||
1130 | /*-- Configuration Record: authenticateStation (data portion only) --*/ | 1130 | /*-- Configuration Record: authenticateStation (data portion only) --*/ |
1131 | typedef struct hfa384x_authenticateStation_data | 1131 | typedef struct hfa384x_authenticateStation_data |
@@ -1133,7 +1133,7 @@ typedef struct hfa384x_authenticateStation_data | |||
1133 | u8 address[WLAN_ADDR_LEN]; | 1133 | u8 address[WLAN_ADDR_LEN]; |
1134 | u16 status; | 1134 | u16 status; |
1135 | u16 algorithm; | 1135 | u16 algorithm; |
1136 | } __WLAN_ATTRIB_PACK__ hfa384x_authenticateStation_data_t; | 1136 | } __attribute__((packed)) hfa384x_authenticateStation_data_t; |
1137 | 1137 | ||
1138 | /*-- Configuration Record: associateStation (data portion only) --*/ | 1138 | /*-- Configuration Record: associateStation (data portion only) --*/ |
1139 | typedef struct hfa384x_associateStation_data | 1139 | typedef struct hfa384x_associateStation_data |
@@ -1141,14 +1141,14 @@ typedef struct hfa384x_associateStation_data | |||
1141 | u8 address[WLAN_ADDR_LEN]; | 1141 | u8 address[WLAN_ADDR_LEN]; |
1142 | u16 status; | 1142 | u16 status; |
1143 | u16 type; | 1143 | u16 type; |
1144 | } __WLAN_ATTRIB_PACK__ hfa384x_associateStation_data_t; | 1144 | } __attribute__((packed)) hfa384x_associateStation_data_t; |
1145 | 1145 | ||
1146 | /*-- Configuration Record: ChannelInfoRequest (data portion only) --*/ | 1146 | /*-- Configuration Record: ChannelInfoRequest (data portion only) --*/ |
1147 | typedef struct hfa384x_ChannelInfoRequest_data | 1147 | typedef struct hfa384x_ChannelInfoRequest_data |
1148 | { | 1148 | { |
1149 | u16 channelList; | 1149 | u16 channelList; |
1150 | u16 channelDwellTime; | 1150 | u16 channelDwellTime; |
1151 | } __WLAN_ATTRIB_PACK__ hfa384x_ChannelInfoRequest_data_t; | 1151 | } __attribute__((packed)) hfa384x_ChannelInfoRequest_data_t; |
1152 | 1152 | ||
1153 | /*-- Configuration Record: WEPKeyMapping (data portion only) --*/ | 1153 | /*-- Configuration Record: WEPKeyMapping (data portion only) --*/ |
1154 | typedef struct hfa384x_WEPKeyMapping | 1154 | typedef struct hfa384x_WEPKeyMapping |
@@ -1158,14 +1158,14 @@ typedef struct hfa384x_WEPKeyMapping | |||
1158 | u8 key[16]; | 1158 | u8 key[16]; |
1159 | u8 mic_transmit_key[4]; | 1159 | u8 mic_transmit_key[4]; |
1160 | u8 mic_receive_key[4]; | 1160 | u8 mic_receive_key[4]; |
1161 | } __WLAN_ATTRIB_PACK__ hfa384x_WEPKeyMapping_t; | 1161 | } __attribute__((packed)) hfa384x_WEPKeyMapping_t; |
1162 | 1162 | ||
1163 | /*-- Configuration Record: WPAData (data portion only) --*/ | 1163 | /*-- Configuration Record: WPAData (data portion only) --*/ |
1164 | typedef struct hfa384x_WPAData | 1164 | typedef struct hfa384x_WPAData |
1165 | { | 1165 | { |
1166 | u16 datalen; | 1166 | u16 datalen; |
1167 | u8 data[0]; // max 80 | 1167 | u8 data[0]; // max 80 |
1168 | } __WLAN_ATTRIB_PACK__ hfa384x_WPAData_t; | 1168 | } __attribute__((packed)) hfa384x_WPAData_t; |
1169 | 1169 | ||
1170 | /*-------------------------------------------------------------------- | 1170 | /*-------------------------------------------------------------------- |
1171 | Configuration Record Structures: Behavior Parameters | 1171 | Configuration Record Structures: Behavior Parameters |
@@ -1175,7 +1175,7 @@ Configuration Record Structures: Behavior Parameters | |||
1175 | typedef struct hfa384x_TickTime | 1175 | typedef struct hfa384x_TickTime |
1176 | { | 1176 | { |
1177 | u16 TickTime; | 1177 | u16 TickTime; |
1178 | } __WLAN_ATTRIB_PACK__ hfa384x_TickTime_t; | 1178 | } __attribute__((packed)) hfa384x_TickTime_t; |
1179 | 1179 | ||
1180 | /*-------------------------------------------------------------------- | 1180 | /*-------------------------------------------------------------------- |
1181 | Information Record Structures: NIC Information | 1181 | Information Record Structures: NIC Information |
@@ -1185,7 +1185,7 @@ Information Record Structures: NIC Information | |||
1185 | typedef struct hfa384x_MaxLoadTime | 1185 | typedef struct hfa384x_MaxLoadTime |
1186 | { | 1186 | { |
1187 | u16 MaxLoadTime; | 1187 | u16 MaxLoadTime; |
1188 | } __WLAN_ATTRIB_PACK__ hfa384x_MaxLoadTime_t; | 1188 | } __attribute__((packed)) hfa384x_MaxLoadTime_t; |
1189 | 1189 | ||
1190 | /*-- Information Record: DownLoadBuffer --*/ | 1190 | /*-- Information Record: DownLoadBuffer --*/ |
1191 | /* NOTE: The page and offset are in AUX format */ | 1191 | /* NOTE: The page and offset are in AUX format */ |
@@ -1194,7 +1194,7 @@ typedef struct hfa384x_downloadbuffer | |||
1194 | u16 page; | 1194 | u16 page; |
1195 | u16 offset; | 1195 | u16 offset; |
1196 | u16 len; | 1196 | u16 len; |
1197 | } __WLAN_ATTRIB_PACK__ hfa384x_downloadbuffer_t; | 1197 | } __attribute__((packed)) hfa384x_downloadbuffer_t; |
1198 | 1198 | ||
1199 | /*-- Information Record: PRIIdentity --*/ | 1199 | /*-- Information Record: PRIIdentity --*/ |
1200 | typedef struct hfa384x_PRIIdentity | 1200 | typedef struct hfa384x_PRIIdentity |
@@ -1203,7 +1203,7 @@ typedef struct hfa384x_PRIIdentity | |||
1203 | u16 PRIVariant; | 1203 | u16 PRIVariant; |
1204 | u16 PRIMajorVersion; | 1204 | u16 PRIMajorVersion; |
1205 | u16 PRIMinorVersion; | 1205 | u16 PRIMinorVersion; |
1206 | } __WLAN_ATTRIB_PACK__ hfa384x_PRIIdentity_t; | 1206 | } __attribute__((packed)) hfa384x_PRIIdentity_t; |
1207 | 1207 | ||
1208 | /*-- Information Record: PRISupRange --*/ | 1208 | /*-- Information Record: PRISupRange --*/ |
1209 | typedef struct hfa384x_PRISupRange | 1209 | typedef struct hfa384x_PRISupRange |
@@ -1213,7 +1213,7 @@ typedef struct hfa384x_PRISupRange | |||
1213 | u16 PRIVariant; | 1213 | u16 PRIVariant; |
1214 | u16 PRIBottom; | 1214 | u16 PRIBottom; |
1215 | u16 PRITop; | 1215 | u16 PRITop; |
1216 | } __WLAN_ATTRIB_PACK__ hfa384x_PRISupRange_t; | 1216 | } __attribute__((packed)) hfa384x_PRISupRange_t; |
1217 | 1217 | ||
1218 | /*-- Information Record: CFIActRanges --*/ | 1218 | /*-- Information Record: CFIActRanges --*/ |
1219 | typedef struct hfa384x_CFIActRanges | 1219 | typedef struct hfa384x_CFIActRanges |
@@ -1223,13 +1223,13 @@ typedef struct hfa384x_CFIActRanges | |||
1223 | u16 CFIVariant; | 1223 | u16 CFIVariant; |
1224 | u16 CFIBottom; | 1224 | u16 CFIBottom; |
1225 | u16 CFITop; | 1225 | u16 CFITop; |
1226 | } __WLAN_ATTRIB_PACK__ hfa384x_CFIActRanges_t; | 1226 | } __attribute__((packed)) hfa384x_CFIActRanges_t; |
1227 | 1227 | ||
1228 | /*-- Information Record: NICSerialNumber --*/ | 1228 | /*-- Information Record: NICSerialNumber --*/ |
1229 | typedef struct hfa384x_NICSerialNumber | 1229 | typedef struct hfa384x_NICSerialNumber |
1230 | { | 1230 | { |
1231 | u8 NICSerialNumber[12]; | 1231 | u8 NICSerialNumber[12]; |
1232 | } __WLAN_ATTRIB_PACK__ hfa384x_NICSerialNumber_t; | 1232 | } __attribute__((packed)) hfa384x_NICSerialNumber_t; |
1233 | 1233 | ||
1234 | /*-- Information Record: NICIdentity --*/ | 1234 | /*-- Information Record: NICIdentity --*/ |
1235 | typedef struct hfa384x_NICIdentity | 1235 | typedef struct hfa384x_NICIdentity |
@@ -1238,7 +1238,7 @@ typedef struct hfa384x_NICIdentity | |||
1238 | u16 NICVariant; | 1238 | u16 NICVariant; |
1239 | u16 NICMajorVersion; | 1239 | u16 NICMajorVersion; |
1240 | u16 NICMinorVersion; | 1240 | u16 NICMinorVersion; |
1241 | } __WLAN_ATTRIB_PACK__ hfa384x_NICIdentity_t; | 1241 | } __attribute__((packed)) hfa384x_NICIdentity_t; |
1242 | 1242 | ||
1243 | /*-- Information Record: MFISupRange --*/ | 1243 | /*-- Information Record: MFISupRange --*/ |
1244 | typedef struct hfa384x_MFISupRange | 1244 | typedef struct hfa384x_MFISupRange |
@@ -1248,7 +1248,7 @@ typedef struct hfa384x_MFISupRange | |||
1248 | u16 MFIVariant; | 1248 | u16 MFIVariant; |
1249 | u16 MFIBottom; | 1249 | u16 MFIBottom; |
1250 | u16 MFITop; | 1250 | u16 MFITop; |
1251 | } __WLAN_ATTRIB_PACK__ hfa384x_MFISupRange_t; | 1251 | } __attribute__((packed)) hfa384x_MFISupRange_t; |
1252 | 1252 | ||
1253 | /*-- Information Record: CFISupRange --*/ | 1253 | /*-- Information Record: CFISupRange --*/ |
1254 | typedef struct hfa384x_CFISupRange | 1254 | typedef struct hfa384x_CFISupRange |
@@ -1258,44 +1258,44 @@ typedef struct hfa384x_CFISupRange | |||
1258 | u16 CFIVariant; | 1258 | u16 CFIVariant; |
1259 | u16 CFIBottom; | 1259 | u16 CFIBottom; |
1260 | u16 CFITop; | 1260 | u16 CFITop; |
1261 | } __WLAN_ATTRIB_PACK__ hfa384x_CFISupRange_t; | 1261 | } __attribute__((packed)) hfa384x_CFISupRange_t; |
1262 | 1262 | ||
1263 | /*-- Information Record: BUILDSEQ:BuildSeq --*/ | 1263 | /*-- Information Record: BUILDSEQ:BuildSeq --*/ |
1264 | typedef struct hfa384x_BuildSeq { | 1264 | typedef struct hfa384x_BuildSeq { |
1265 | u16 primary; | 1265 | u16 primary; |
1266 | u16 secondary; | 1266 | u16 secondary; |
1267 | } __WLAN_ATTRIB_PACK__ hfa384x_BuildSeq_t; | 1267 | } __attribute__((packed)) hfa384x_BuildSeq_t; |
1268 | 1268 | ||
1269 | /*-- Information Record: FWID --*/ | 1269 | /*-- Information Record: FWID --*/ |
1270 | #define HFA384x_FWID_LEN 14 | 1270 | #define HFA384x_FWID_LEN 14 |
1271 | typedef struct hfa384x_FWID { | 1271 | typedef struct hfa384x_FWID { |
1272 | u8 primary[HFA384x_FWID_LEN]; | 1272 | u8 primary[HFA384x_FWID_LEN]; |
1273 | u8 secondary[HFA384x_FWID_LEN]; | 1273 | u8 secondary[HFA384x_FWID_LEN]; |
1274 | } __WLAN_ATTRIB_PACK__ hfa384x_FWID_t; | 1274 | } __attribute__((packed)) hfa384x_FWID_t; |
1275 | 1275 | ||
1276 | /*-- Information Record: ChannelList --*/ | 1276 | /*-- Information Record: ChannelList --*/ |
1277 | typedef struct hfa384x_ChannelList | 1277 | typedef struct hfa384x_ChannelList |
1278 | { | 1278 | { |
1279 | u16 ChannelList; | 1279 | u16 ChannelList; |
1280 | } __WLAN_ATTRIB_PACK__ hfa384x_ChannelList_t; | 1280 | } __attribute__((packed)) hfa384x_ChannelList_t; |
1281 | 1281 | ||
1282 | /*-- Information Record: RegulatoryDomains --*/ | 1282 | /*-- Information Record: RegulatoryDomains --*/ |
1283 | typedef struct hfa384x_RegulatoryDomains | 1283 | typedef struct hfa384x_RegulatoryDomains |
1284 | { | 1284 | { |
1285 | u8 RegulatoryDomains[12]; | 1285 | u8 RegulatoryDomains[12]; |
1286 | } __WLAN_ATTRIB_PACK__ hfa384x_RegulatoryDomains_t; | 1286 | } __attribute__((packed)) hfa384x_RegulatoryDomains_t; |
1287 | 1287 | ||
1288 | /*-- Information Record: TempType --*/ | 1288 | /*-- Information Record: TempType --*/ |
1289 | typedef struct hfa384x_TempType | 1289 | typedef struct hfa384x_TempType |
1290 | { | 1290 | { |
1291 | u16 TempType; | 1291 | u16 TempType; |
1292 | } __WLAN_ATTRIB_PACK__ hfa384x_TempType_t; | 1292 | } __attribute__((packed)) hfa384x_TempType_t; |
1293 | 1293 | ||
1294 | /*-- Information Record: CIS --*/ | 1294 | /*-- Information Record: CIS --*/ |
1295 | typedef struct hfa384x_CIS | 1295 | typedef struct hfa384x_CIS |
1296 | { | 1296 | { |
1297 | u8 CIS[480]; | 1297 | u8 CIS[480]; |
1298 | } __WLAN_ATTRIB_PACK__ hfa384x_CIS_t; | 1298 | } __attribute__((packed)) hfa384x_CIS_t; |
1299 | 1299 | ||
1300 | /*-- Information Record: STAIdentity --*/ | 1300 | /*-- Information Record: STAIdentity --*/ |
1301 | typedef struct hfa384x_STAIdentity | 1301 | typedef struct hfa384x_STAIdentity |
@@ -1304,7 +1304,7 @@ typedef struct hfa384x_STAIdentity | |||
1304 | u16 STAVariant; | 1304 | u16 STAVariant; |
1305 | u16 STAMajorVersion; | 1305 | u16 STAMajorVersion; |
1306 | u16 STAMinorVersion; | 1306 | u16 STAMinorVersion; |
1307 | } __WLAN_ATTRIB_PACK__ hfa384x_STAIdentity_t; | 1307 | } __attribute__((packed)) hfa384x_STAIdentity_t; |
1308 | 1308 | ||
1309 | /*-- Information Record: STASupRange --*/ | 1309 | /*-- Information Record: STASupRange --*/ |
1310 | typedef struct hfa384x_STASupRange | 1310 | typedef struct hfa384x_STASupRange |
@@ -1314,7 +1314,7 @@ typedef struct hfa384x_STASupRange | |||
1314 | u16 STAVariant; | 1314 | u16 STAVariant; |
1315 | u16 STABottom; | 1315 | u16 STABottom; |
1316 | u16 STATop; | 1316 | u16 STATop; |
1317 | } __WLAN_ATTRIB_PACK__ hfa384x_STASupRange_t; | 1317 | } __attribute__((packed)) hfa384x_STASupRange_t; |
1318 | 1318 | ||
1319 | /*-- Information Record: MFIActRanges --*/ | 1319 | /*-- Information Record: MFIActRanges --*/ |
1320 | typedef struct hfa384x_MFIActRanges | 1320 | typedef struct hfa384x_MFIActRanges |
@@ -1324,7 +1324,7 @@ typedef struct hfa384x_MFIActRanges | |||
1324 | u16 MFIVariant; | 1324 | u16 MFIVariant; |
1325 | u16 MFIBottom; | 1325 | u16 MFIBottom; |
1326 | u16 MFITop; | 1326 | u16 MFITop; |
1327 | } __WLAN_ATTRIB_PACK__ hfa384x_MFIActRanges_t; | 1327 | } __attribute__((packed)) hfa384x_MFIActRanges_t; |
1328 | 1328 | ||
1329 | /*-------------------------------------------------------------------- | 1329 | /*-------------------------------------------------------------------- |
1330 | Information Record Structures: NIC Information | 1330 | Information Record Structures: NIC Information |
@@ -1334,7 +1334,7 @@ Information Record Structures: NIC Information | |||
1334 | typedef struct hfa384x_PortStatus | 1334 | typedef struct hfa384x_PortStatus |
1335 | { | 1335 | { |
1336 | u16 PortStatus; | 1336 | u16 PortStatus; |
1337 | } __WLAN_ATTRIB_PACK__ hfa384x_PortStatus_t; | 1337 | } __attribute__((packed)) hfa384x_PortStatus_t; |
1338 | 1338 | ||
1339 | #define HFA384x_PSTATUS_DISABLED ((u16)1) | 1339 | #define HFA384x_PSTATUS_DISABLED ((u16)1) |
1340 | #define HFA384x_PSTATUS_SEARCHING ((u16)2) | 1340 | #define HFA384x_PSTATUS_SEARCHING ((u16)2) |
@@ -1347,13 +1347,13 @@ typedef struct hfa384x_PortStatus | |||
1347 | typedef struct hfa384x_CurrentSSID | 1347 | typedef struct hfa384x_CurrentSSID |
1348 | { | 1348 | { |
1349 | u8 CurrentSSID[34]; | 1349 | u8 CurrentSSID[34]; |
1350 | } __WLAN_ATTRIB_PACK__ hfa384x_CurrentSSID_t; | 1350 | } __attribute__((packed)) hfa384x_CurrentSSID_t; |
1351 | 1351 | ||
1352 | /*-- Information Record: CurrentBSSID --*/ | 1352 | /*-- Information Record: CurrentBSSID --*/ |
1353 | typedef struct hfa384x_CurrentBSSID | 1353 | typedef struct hfa384x_CurrentBSSID |
1354 | { | 1354 | { |
1355 | u8 CurrentBSSID[6]; | 1355 | u8 CurrentBSSID[6]; |
1356 | } __WLAN_ATTRIB_PACK__ hfa384x_CurrentBSSID_t; | 1356 | } __attribute__((packed)) hfa384x_CurrentBSSID_t; |
1357 | 1357 | ||
1358 | /*-- Information Record: commsquality --*/ | 1358 | /*-- Information Record: commsquality --*/ |
1359 | typedef struct hfa384x_commsquality | 1359 | typedef struct hfa384x_commsquality |
@@ -1361,7 +1361,7 @@ typedef struct hfa384x_commsquality | |||
1361 | u16 CQ_currBSS; | 1361 | u16 CQ_currBSS; |
1362 | u16 ASL_currBSS; | 1362 | u16 ASL_currBSS; |
1363 | u16 ANL_currFC; | 1363 | u16 ANL_currFC; |
1364 | } __WLAN_ATTRIB_PACK__ hfa384x_commsquality_t; | 1364 | } __attribute__((packed)) hfa384x_commsquality_t; |
1365 | 1365 | ||
1366 | /*-- Information Record: dmbcommsquality --*/ | 1366 | /*-- Information Record: dmbcommsquality --*/ |
1367 | typedef struct hfa384x_dbmcommsquality | 1367 | typedef struct hfa384x_dbmcommsquality |
@@ -1369,19 +1369,19 @@ typedef struct hfa384x_dbmcommsquality | |||
1369 | u16 CQdbm_currBSS; | 1369 | u16 CQdbm_currBSS; |
1370 | u16 ASLdbm_currBSS; | 1370 | u16 ASLdbm_currBSS; |
1371 | u16 ANLdbm_currFC; | 1371 | u16 ANLdbm_currFC; |
1372 | } __WLAN_ATTRIB_PACK__ hfa384x_dbmcommsquality_t; | 1372 | } __attribute__((packed)) hfa384x_dbmcommsquality_t; |
1373 | 1373 | ||
1374 | /*-- Information Record: CurrentTxRate --*/ | 1374 | /*-- Information Record: CurrentTxRate --*/ |
1375 | typedef struct hfa384x_CurrentTxRate | 1375 | typedef struct hfa384x_CurrentTxRate |
1376 | { | 1376 | { |
1377 | u16 CurrentTxRate; | 1377 | u16 CurrentTxRate; |
1378 | } __WLAN_ATTRIB_PACK__ hfa384x_CurrentTxRate_t; | 1378 | } __attribute__((packed)) hfa384x_CurrentTxRate_t; |
1379 | 1379 | ||
1380 | /*-- Information Record: CurrentBeaconInterval --*/ | 1380 | /*-- Information Record: CurrentBeaconInterval --*/ |
1381 | typedef struct hfa384x_CurrentBeaconInterval | 1381 | typedef struct hfa384x_CurrentBeaconInterval |
1382 | { | 1382 | { |
1383 | u16 CurrentBeaconInterval; | 1383 | u16 CurrentBeaconInterval; |
1384 | } __WLAN_ATTRIB_PACK__ hfa384x_CurrentBeaconInterval_t; | 1384 | } __attribute__((packed)) hfa384x_CurrentBeaconInterval_t; |
1385 | 1385 | ||
1386 | /*-- Information Record: CurrentScaleThresholds --*/ | 1386 | /*-- Information Record: CurrentScaleThresholds --*/ |
1387 | typedef struct hfa384x_CurrentScaleThresholds | 1387 | typedef struct hfa384x_CurrentScaleThresholds |
@@ -1391,50 +1391,50 @@ typedef struct hfa384x_CurrentScaleThresholds | |||
1391 | u16 DeferDetectThreshold; | 1391 | u16 DeferDetectThreshold; |
1392 | u16 CellSearchThreshold; /* Stations only */ | 1392 | u16 CellSearchThreshold; /* Stations only */ |
1393 | u16 DeadSpotThreshold; /* Stations only */ | 1393 | u16 DeadSpotThreshold; /* Stations only */ |
1394 | } __WLAN_ATTRIB_PACK__ hfa384x_CurrentScaleThresholds_t; | 1394 | } __attribute__((packed)) hfa384x_CurrentScaleThresholds_t; |
1395 | 1395 | ||
1396 | /*-- Information Record: ProtocolRspTime --*/ | 1396 | /*-- Information Record: ProtocolRspTime --*/ |
1397 | typedef struct hfa384x_ProtocolRspTime | 1397 | typedef struct hfa384x_ProtocolRspTime |
1398 | { | 1398 | { |
1399 | u16 ProtocolRspTime; | 1399 | u16 ProtocolRspTime; |
1400 | } __WLAN_ATTRIB_PACK__ hfa384x_ProtocolRspTime_t; | 1400 | } __attribute__((packed)) hfa384x_ProtocolRspTime_t; |
1401 | 1401 | ||
1402 | /*-- Information Record: ShortRetryLimit --*/ | 1402 | /*-- Information Record: ShortRetryLimit --*/ |
1403 | typedef struct hfa384x_ShortRetryLimit | 1403 | typedef struct hfa384x_ShortRetryLimit |
1404 | { | 1404 | { |
1405 | u16 ShortRetryLimit; | 1405 | u16 ShortRetryLimit; |
1406 | } __WLAN_ATTRIB_PACK__ hfa384x_ShortRetryLimit_t; | 1406 | } __attribute__((packed)) hfa384x_ShortRetryLimit_t; |
1407 | 1407 | ||
1408 | /*-- Information Record: LongRetryLimit --*/ | 1408 | /*-- Information Record: LongRetryLimit --*/ |
1409 | typedef struct hfa384x_LongRetryLimit | 1409 | typedef struct hfa384x_LongRetryLimit |
1410 | { | 1410 | { |
1411 | u16 LongRetryLimit; | 1411 | u16 LongRetryLimit; |
1412 | } __WLAN_ATTRIB_PACK__ hfa384x_LongRetryLimit_t; | 1412 | } __attribute__((packed)) hfa384x_LongRetryLimit_t; |
1413 | 1413 | ||
1414 | /*-- Information Record: MaxTransmitLifetime --*/ | 1414 | /*-- Information Record: MaxTransmitLifetime --*/ |
1415 | typedef struct hfa384x_MaxTransmitLifetime | 1415 | typedef struct hfa384x_MaxTransmitLifetime |
1416 | { | 1416 | { |
1417 | u16 MaxTransmitLifetime; | 1417 | u16 MaxTransmitLifetime; |
1418 | } __WLAN_ATTRIB_PACK__ hfa384x_MaxTransmitLifetime_t; | 1418 | } __attribute__((packed)) hfa384x_MaxTransmitLifetime_t; |
1419 | 1419 | ||
1420 | /*-- Information Record: MaxReceiveLifetime --*/ | 1420 | /*-- Information Record: MaxReceiveLifetime --*/ |
1421 | typedef struct hfa384x_MaxReceiveLifetime | 1421 | typedef struct hfa384x_MaxReceiveLifetime |
1422 | { | 1422 | { |
1423 | u16 MaxReceiveLifetime; | 1423 | u16 MaxReceiveLifetime; |
1424 | } __WLAN_ATTRIB_PACK__ hfa384x_MaxReceiveLifetime_t; | 1424 | } __attribute__((packed)) hfa384x_MaxReceiveLifetime_t; |
1425 | 1425 | ||
1426 | /*-- Information Record: CFPollable --*/ | 1426 | /*-- Information Record: CFPollable --*/ |
1427 | typedef struct hfa384x_CFPollable | 1427 | typedef struct hfa384x_CFPollable |
1428 | { | 1428 | { |
1429 | u16 CFPollable; | 1429 | u16 CFPollable; |
1430 | } __WLAN_ATTRIB_PACK__ hfa384x_CFPollable_t; | 1430 | } __attribute__((packed)) hfa384x_CFPollable_t; |
1431 | 1431 | ||
1432 | /*-- Information Record: AuthenticationAlgorithms --*/ | 1432 | /*-- Information Record: AuthenticationAlgorithms --*/ |
1433 | typedef struct hfa384x_AuthenticationAlgorithms | 1433 | typedef struct hfa384x_AuthenticationAlgorithms |
1434 | { | 1434 | { |
1435 | u16 AuthenticationType; | 1435 | u16 AuthenticationType; |
1436 | u16 TypeEnabled; | 1436 | u16 TypeEnabled; |
1437 | } __WLAN_ATTRIB_PACK__ hfa384x_AuthenticationAlgorithms_t; | 1437 | } __attribute__((packed)) hfa384x_AuthenticationAlgorithms_t; |
1438 | 1438 | ||
1439 | /*-- Information Record: AuthenticationAlgorithms | 1439 | /*-- Information Record: AuthenticationAlgorithms |
1440 | (data only --*/ | 1440 | (data only --*/ |
@@ -1442,19 +1442,19 @@ typedef struct hfa384x_AuthenticationAlgorithms_data | |||
1442 | { | 1442 | { |
1443 | u16 AuthenticationType; | 1443 | u16 AuthenticationType; |
1444 | u16 TypeEnabled; | 1444 | u16 TypeEnabled; |
1445 | } __WLAN_ATTRIB_PACK__ hfa384x_AuthenticationAlgorithms_data_t; | 1445 | } __attribute__((packed)) hfa384x_AuthenticationAlgorithms_data_t; |
1446 | 1446 | ||
1447 | /*-- Information Record: PrivacyOptionImplemented --*/ | 1447 | /*-- Information Record: PrivacyOptionImplemented --*/ |
1448 | typedef struct hfa384x_PrivacyOptionImplemented | 1448 | typedef struct hfa384x_PrivacyOptionImplemented |
1449 | { | 1449 | { |
1450 | u16 PrivacyOptionImplemented; | 1450 | u16 PrivacyOptionImplemented; |
1451 | } __WLAN_ATTRIB_PACK__ hfa384x_PrivacyOptionImplemented_t; | 1451 | } __attribute__((packed)) hfa384x_PrivacyOptionImplemented_t; |
1452 | 1452 | ||
1453 | /*-- Information Record: OwnMACAddress --*/ | 1453 | /*-- Information Record: OwnMACAddress --*/ |
1454 | typedef struct hfa384x_OwnMACAddress | 1454 | typedef struct hfa384x_OwnMACAddress |
1455 | { | 1455 | { |
1456 | u8 OwnMACAddress[6]; | 1456 | u8 OwnMACAddress[6]; |
1457 | } __WLAN_ATTRIB_PACK__ hfa384x_OwnMACAddress_t; | 1457 | } __attribute__((packed)) hfa384x_OwnMACAddress_t; |
1458 | 1458 | ||
1459 | /*-- Information Record: PCFInfo --*/ | 1459 | /*-- Information Record: PCFInfo --*/ |
1460 | typedef struct hfa384x_PCFInfo | 1460 | typedef struct hfa384x_PCFInfo |
@@ -1463,7 +1463,7 @@ typedef struct hfa384x_PCFInfo | |||
1463 | u16 CFPPeriod; | 1463 | u16 CFPPeriod; |
1464 | u16 CFPMaxDuration; | 1464 | u16 CFPMaxDuration; |
1465 | u16 CFPFlags; | 1465 | u16 CFPFlags; |
1466 | } __WLAN_ATTRIB_PACK__ hfa384x_PCFInfo_t; | 1466 | } __attribute__((packed)) hfa384x_PCFInfo_t; |
1467 | 1467 | ||
1468 | /*-- Information Record: PCFInfo (data portion only) --*/ | 1468 | /*-- Information Record: PCFInfo (data portion only) --*/ |
1469 | typedef struct hfa384x_PCFInfo_data | 1469 | typedef struct hfa384x_PCFInfo_data |
@@ -1472,7 +1472,7 @@ typedef struct hfa384x_PCFInfo_data | |||
1472 | u16 CFPPeriod; | 1472 | u16 CFPPeriod; |
1473 | u16 CFPMaxDuration; | 1473 | u16 CFPMaxDuration; |
1474 | u16 CFPFlags; | 1474 | u16 CFPFlags; |
1475 | } __WLAN_ATTRIB_PACK__ hfa384x_PCFInfo_data_t; | 1475 | } __attribute__((packed)) hfa384x_PCFInfo_data_t; |
1476 | 1476 | ||
1477 | /*-------------------------------------------------------------------- | 1477 | /*-------------------------------------------------------------------- |
1478 | Information Record Structures: Modem Information Records | 1478 | Information Record Structures: Modem Information Records |
@@ -1482,31 +1482,31 @@ Information Record Structures: Modem Information Records | |||
1482 | typedef struct hfa384x_PHYType | 1482 | typedef struct hfa384x_PHYType |
1483 | { | 1483 | { |
1484 | u16 PHYType; | 1484 | u16 PHYType; |
1485 | } __WLAN_ATTRIB_PACK__ hfa384x_PHYType_t; | 1485 | } __attribute__((packed)) hfa384x_PHYType_t; |
1486 | 1486 | ||
1487 | /*-- Information Record: CurrentChannel --*/ | 1487 | /*-- Information Record: CurrentChannel --*/ |
1488 | typedef struct hfa384x_CurrentChannel | 1488 | typedef struct hfa384x_CurrentChannel |
1489 | { | 1489 | { |
1490 | u16 CurrentChannel; | 1490 | u16 CurrentChannel; |
1491 | } __WLAN_ATTRIB_PACK__ hfa384x_CurrentChannel_t; | 1491 | } __attribute__((packed)) hfa384x_CurrentChannel_t; |
1492 | 1492 | ||
1493 | /*-- Information Record: CurrentPowerState --*/ | 1493 | /*-- Information Record: CurrentPowerState --*/ |
1494 | typedef struct hfa384x_CurrentPowerState | 1494 | typedef struct hfa384x_CurrentPowerState |
1495 | { | 1495 | { |
1496 | u16 CurrentPowerState; | 1496 | u16 CurrentPowerState; |
1497 | } __WLAN_ATTRIB_PACK__ hfa384x_CurrentPowerState_t; | 1497 | } __attribute__((packed)) hfa384x_CurrentPowerState_t; |
1498 | 1498 | ||
1499 | /*-- Information Record: CCAMode --*/ | 1499 | /*-- Information Record: CCAMode --*/ |
1500 | typedef struct hfa384x_CCAMode | 1500 | typedef struct hfa384x_CCAMode |
1501 | { | 1501 | { |
1502 | u16 CCAMode; | 1502 | u16 CCAMode; |
1503 | } __WLAN_ATTRIB_PACK__ hfa384x_CCAMode_t; | 1503 | } __attribute__((packed)) hfa384x_CCAMode_t; |
1504 | 1504 | ||
1505 | /*-- Information Record: SupportedDataRates --*/ | 1505 | /*-- Information Record: SupportedDataRates --*/ |
1506 | typedef struct hfa384x_SupportedDataRates | 1506 | typedef struct hfa384x_SupportedDataRates |
1507 | { | 1507 | { |
1508 | u8 SupportedDataRates[10]; | 1508 | u8 SupportedDataRates[10]; |
1509 | } __WLAN_ATTRIB_PACK__ hfa384x_SupportedDataRates_t; | 1509 | } __attribute__((packed)) hfa384x_SupportedDataRates_t; |
1510 | 1510 | ||
1511 | /*-- Information Record: LFOStatus --*/ | 1511 | /*-- Information Record: LFOStatus --*/ |
1512 | typedef struct hfa384x_LFOStatus | 1512 | typedef struct hfa384x_LFOStatus |
@@ -1514,7 +1514,7 @@ typedef struct hfa384x_LFOStatus | |||
1514 | u16 TestResults; | 1514 | u16 TestResults; |
1515 | u16 LFOResult; | 1515 | u16 LFOResult; |
1516 | u16 VRHFOResult; | 1516 | u16 VRHFOResult; |
1517 | } __WLAN_ATTRIB_PACK__ hfa384x_LFOStatus_t; | 1517 | } __attribute__((packed)) hfa384x_LFOStatus_t; |
1518 | 1518 | ||
1519 | #define HFA384x_TESTRESULT_ALLPASSED BIT0 | 1519 | #define HFA384x_TESTRESULT_ALLPASSED BIT0 |
1520 | #define HFA384x_TESTRESULT_LFO_FAIL BIT1 | 1520 | #define HFA384x_TESTRESULT_LFO_FAIL BIT1 |
@@ -1530,7 +1530,7 @@ typedef struct hfa384x_LEDControl | |||
1530 | u16 assoc_on; | 1530 | u16 assoc_on; |
1531 | u16 assoc_off; | 1531 | u16 assoc_off; |
1532 | u16 activity; | 1532 | u16 activity; |
1533 | } __WLAN_ATTRIB_PACK__ hfa384x_LEDControl_t; | 1533 | } __attribute__((packed)) hfa384x_LEDControl_t; |
1534 | 1534 | ||
1535 | /*-------------------------------------------------------------------- | 1535 | /*-------------------------------------------------------------------- |
1536 | FRAME DESCRIPTORS AND FRAME STRUCTURES | 1536 | FRAME DESCRIPTORS AND FRAME STRUCTURES |
@@ -1599,7 +1599,7 @@ typedef struct hfa384x_tx_frame | |||
1599 | u8 dest_addr[6]; | 1599 | u8 dest_addr[6]; |
1600 | u8 src_addr[6]; | 1600 | u8 src_addr[6]; |
1601 | u16 data_length; /* big endian format */ | 1601 | u16 data_length; /* big endian format */ |
1602 | } __WLAN_ATTRIB_PACK__ hfa384x_tx_frame_t; | 1602 | } __attribute__((packed)) hfa384x_tx_frame_t; |
1603 | /*-------------------------------------------------------------------- | 1603 | /*-------------------------------------------------------------------- |
1604 | Communication Frames: Field Masks for Transmit Frames | 1604 | Communication Frames: Field Masks for Transmit Frames |
1605 | --------------------------------------------------------------------*/ | 1605 | --------------------------------------------------------------------*/ |
@@ -1683,7 +1683,7 @@ typedef struct hfa384x_rx_frame | |||
1683 | u8 dest_addr[6]; | 1683 | u8 dest_addr[6]; |
1684 | u8 src_addr[6]; | 1684 | u8 src_addr[6]; |
1685 | u16 data_length; /* IEEE? (big endian) format */ | 1685 | u16 data_length; /* IEEE? (big endian) format */ |
1686 | } __WLAN_ATTRIB_PACK__ hfa384x_rx_frame_t; | 1686 | } __attribute__((packed)) hfa384x_rx_frame_t; |
1687 | /*-------------------------------------------------------------------- | 1687 | /*-------------------------------------------------------------------- |
1688 | Communication Frames: Field Masks for Receive Frames | 1688 | Communication Frames: Field Masks for Receive Frames |
1689 | --------------------------------------------------------------------*/ | 1689 | --------------------------------------------------------------------*/ |
@@ -1736,7 +1736,7 @@ typedef struct hfa384x_HandoverAddr | |||
1736 | u16 framelen; | 1736 | u16 framelen; |
1737 | u16 infotype; | 1737 | u16 infotype; |
1738 | u8 handover_addr[WLAN_BSSID_LEN]; | 1738 | u8 handover_addr[WLAN_BSSID_LEN]; |
1739 | } __WLAN_ATTRIB_PACK__ hfa384x_HandoverAddr_t; | 1739 | } __attribute__((packed)) hfa384x_HandoverAddr_t; |
1740 | 1740 | ||
1741 | /*-- Inquiry Frame, Diagnose: Communication Tallies --*/ | 1741 | /*-- Inquiry Frame, Diagnose: Communication Tallies --*/ |
1742 | typedef struct hfa384x_CommTallies16 | 1742 | typedef struct hfa384x_CommTallies16 |
@@ -1762,7 +1762,7 @@ typedef struct hfa384x_CommTallies16 | |||
1762 | u16 rxdiscardswepundecr; | 1762 | u16 rxdiscardswepundecr; |
1763 | u16 rxmsginmsgfrag; | 1763 | u16 rxmsginmsgfrag; |
1764 | u16 rxmsginbadmsgfrag; | 1764 | u16 rxmsginbadmsgfrag; |
1765 | } __WLAN_ATTRIB_PACK__ hfa384x_CommTallies16_t; | 1765 | } __attribute__((packed)) hfa384x_CommTallies16_t; |
1766 | 1766 | ||
1767 | typedef struct hfa384x_CommTallies32 | 1767 | typedef struct hfa384x_CommTallies32 |
1768 | { | 1768 | { |
@@ -1787,7 +1787,7 @@ typedef struct hfa384x_CommTallies32 | |||
1787 | u32 rxdiscardswepundecr; | 1787 | u32 rxdiscardswepundecr; |
1788 | u32 rxmsginmsgfrag; | 1788 | u32 rxmsginmsgfrag; |
1789 | u32 rxmsginbadmsgfrag; | 1789 | u32 rxmsginbadmsgfrag; |
1790 | } __WLAN_ATTRIB_PACK__ hfa384x_CommTallies32_t; | 1790 | } __attribute__((packed)) hfa384x_CommTallies32_t; |
1791 | 1791 | ||
1792 | /*-- Inquiry Frame, Diagnose: Scan Results & Subfields--*/ | 1792 | /*-- Inquiry Frame, Diagnose: Scan Results & Subfields--*/ |
1793 | typedef struct hfa384x_ScanResultSub | 1793 | typedef struct hfa384x_ScanResultSub |
@@ -1801,7 +1801,7 @@ typedef struct hfa384x_ScanResultSub | |||
1801 | hfa384x_bytestr32_t ssid; | 1801 | hfa384x_bytestr32_t ssid; |
1802 | u8 supprates[10]; /* 802.11 info element */ | 1802 | u8 supprates[10]; /* 802.11 info element */ |
1803 | u16 proberesp_rate; | 1803 | u16 proberesp_rate; |
1804 | } __WLAN_ATTRIB_PACK__ hfa384x_ScanResultSub_t; | 1804 | } __attribute__((packed)) hfa384x_ScanResultSub_t; |
1805 | 1805 | ||
1806 | typedef struct hfa384x_ScanResult | 1806 | typedef struct hfa384x_ScanResult |
1807 | { | 1807 | { |
@@ -1809,7 +1809,7 @@ typedef struct hfa384x_ScanResult | |||
1809 | u16 scanreason; | 1809 | u16 scanreason; |
1810 | hfa384x_ScanResultSub_t | 1810 | hfa384x_ScanResultSub_t |
1811 | result[HFA384x_SCANRESULT_MAX]; | 1811 | result[HFA384x_SCANRESULT_MAX]; |
1812 | } __WLAN_ATTRIB_PACK__ hfa384x_ScanResult_t; | 1812 | } __attribute__((packed)) hfa384x_ScanResult_t; |
1813 | 1813 | ||
1814 | /*-- Inquiry Frame, Diagnose: ChInfo Results & Subfields--*/ | 1814 | /*-- Inquiry Frame, Diagnose: ChInfo Results & Subfields--*/ |
1815 | typedef struct hfa384x_ChInfoResultSub | 1815 | typedef struct hfa384x_ChInfoResultSub |
@@ -1818,7 +1818,7 @@ typedef struct hfa384x_ChInfoResultSub | |||
1818 | u16 anl; | 1818 | u16 anl; |
1819 | u16 pnl; | 1819 | u16 pnl; |
1820 | u16 active; | 1820 | u16 active; |
1821 | } __WLAN_ATTRIB_PACK__ hfa384x_ChInfoResultSub_t; | 1821 | } __attribute__((packed)) hfa384x_ChInfoResultSub_t; |
1822 | 1822 | ||
1823 | #define HFA384x_CHINFORESULT_BSSACTIVE BIT0 | 1823 | #define HFA384x_CHINFORESULT_BSSACTIVE BIT0 |
1824 | #define HFA384x_CHINFORESULT_PCFACTIVE BIT1 | 1824 | #define HFA384x_CHINFORESULT_PCFACTIVE BIT1 |
@@ -1828,7 +1828,7 @@ typedef struct hfa384x_ChInfoResult | |||
1828 | u16 scanchannels; | 1828 | u16 scanchannels; |
1829 | hfa384x_ChInfoResultSub_t | 1829 | hfa384x_ChInfoResultSub_t |
1830 | result[HFA384x_CHINFORESULT_MAX]; | 1830 | result[HFA384x_CHINFORESULT_MAX]; |
1831 | } __WLAN_ATTRIB_PACK__ hfa384x_ChInfoResult_t; | 1831 | } __attribute__((packed)) hfa384x_ChInfoResult_t; |
1832 | 1832 | ||
1833 | /*-- Inquiry Frame, Diagnose: Host Scan Results & Subfields--*/ | 1833 | /*-- Inquiry Frame, Diagnose: Host Scan Results & Subfields--*/ |
1834 | typedef struct hfa384x_HScanResultSub | 1834 | typedef struct hfa384x_HScanResultSub |
@@ -1843,7 +1843,7 @@ typedef struct hfa384x_HScanResultSub | |||
1843 | u8 supprates[10]; /* 802.11 info element */ | 1843 | u8 supprates[10]; /* 802.11 info element */ |
1844 | u16 proberesp_rate; | 1844 | u16 proberesp_rate; |
1845 | u16 atim; | 1845 | u16 atim; |
1846 | } __WLAN_ATTRIB_PACK__ hfa384x_HScanResultSub_t; | 1846 | } __attribute__((packed)) hfa384x_HScanResultSub_t; |
1847 | 1847 | ||
1848 | typedef struct hfa384x_HScanResult | 1848 | typedef struct hfa384x_HScanResult |
1849 | { | 1849 | { |
@@ -1851,7 +1851,7 @@ typedef struct hfa384x_HScanResult | |||
1851 | u16 rsvd; | 1851 | u16 rsvd; |
1852 | hfa384x_HScanResultSub_t | 1852 | hfa384x_HScanResultSub_t |
1853 | result[HFA384x_HSCANRESULT_MAX]; | 1853 | result[HFA384x_HSCANRESULT_MAX]; |
1854 | } __WLAN_ATTRIB_PACK__ hfa384x_HScanResult_t; | 1854 | } __attribute__((packed)) hfa384x_HScanResult_t; |
1855 | 1855 | ||
1856 | /*-- Unsolicited Frame, MAC Mgmt: LinkStatus --*/ | 1856 | /*-- Unsolicited Frame, MAC Mgmt: LinkStatus --*/ |
1857 | 1857 | ||
@@ -1866,7 +1866,7 @@ typedef struct hfa384x_HScanResult | |||
1866 | typedef struct hfa384x_LinkStatus | 1866 | typedef struct hfa384x_LinkStatus |
1867 | { | 1867 | { |
1868 | u16 linkstatus; | 1868 | u16 linkstatus; |
1869 | } __WLAN_ATTRIB_PACK__ hfa384x_LinkStatus_t; | 1869 | } __attribute__((packed)) hfa384x_LinkStatus_t; |
1870 | 1870 | ||
1871 | 1871 | ||
1872 | /*-- Unsolicited Frame, MAC Mgmt: AssociationStatus (--*/ | 1872 | /*-- Unsolicited Frame, MAC Mgmt: AssociationStatus (--*/ |
@@ -1885,7 +1885,7 @@ typedef struct hfa384x_AssocStatus | |||
1885 | u8 old_ap_addr[WLAN_ADDR_LEN]; | 1885 | u8 old_ap_addr[WLAN_ADDR_LEN]; |
1886 | u16 reason; | 1886 | u16 reason; |
1887 | u16 reserved; | 1887 | u16 reserved; |
1888 | } __WLAN_ATTRIB_PACK__ hfa384x_AssocStatus_t; | 1888 | } __attribute__((packed)) hfa384x_AssocStatus_t; |
1889 | 1889 | ||
1890 | /*-- Unsolicited Frame, MAC Mgmt: AuthRequest (AP Only) --*/ | 1890 | /*-- Unsolicited Frame, MAC Mgmt: AuthRequest (AP Only) --*/ |
1891 | 1891 | ||
@@ -1893,7 +1893,7 @@ typedef struct hfa384x_AuthRequest | |||
1893 | { | 1893 | { |
1894 | u8 sta_addr[WLAN_ADDR_LEN]; | 1894 | u8 sta_addr[WLAN_ADDR_LEN]; |
1895 | u16 algorithm; | 1895 | u16 algorithm; |
1896 | } __WLAN_ATTRIB_PACK__ hfa384x_AuthReq_t; | 1896 | } __attribute__((packed)) hfa384x_AuthReq_t; |
1897 | 1897 | ||
1898 | /*-- Unsolicited Frame, MAC Mgmt: AssocRequest (AP Only) --*/ | 1898 | /*-- Unsolicited Frame, MAC Mgmt: AssocRequest (AP Only) --*/ |
1899 | 1899 | ||
@@ -1902,7 +1902,7 @@ typedef struct hfa384x_AssocRequest | |||
1902 | u8 sta_addr[WLAN_ADDR_LEN]; | 1902 | u8 sta_addr[WLAN_ADDR_LEN]; |
1903 | u16 type; | 1903 | u16 type; |
1904 | u8 wpa_data[80]; | 1904 | u8 wpa_data[80]; |
1905 | } __WLAN_ATTRIB_PACK__ hfa384x_AssocReq_t; | 1905 | } __attribute__((packed)) hfa384x_AssocReq_t; |
1906 | 1906 | ||
1907 | 1907 | ||
1908 | #define HFA384x_ASSOCREQ_TYPE_ASSOC 0 | 1908 | #define HFA384x_ASSOCREQ_TYPE_ASSOC 0 |
@@ -1914,20 +1914,20 @@ typedef struct hfa384x_MicFailure | |||
1914 | { | 1914 | { |
1915 | u8 sender[WLAN_ADDR_LEN]; | 1915 | u8 sender[WLAN_ADDR_LEN]; |
1916 | u8 dest[WLAN_ADDR_LEN]; | 1916 | u8 dest[WLAN_ADDR_LEN]; |
1917 | } __WLAN_ATTRIB_PACK__ hfa384x_MicFailure_t; | 1917 | } __attribute__((packed)) hfa384x_MicFailure_t; |
1918 | 1918 | ||
1919 | /*-- Unsolicited Frame, MAC Mgmt: PSUserCount (AP Only) --*/ | 1919 | /*-- Unsolicited Frame, MAC Mgmt: PSUserCount (AP Only) --*/ |
1920 | 1920 | ||
1921 | typedef struct hfa384x_PSUserCount | 1921 | typedef struct hfa384x_PSUserCount |
1922 | { | 1922 | { |
1923 | u16 usercnt; | 1923 | u16 usercnt; |
1924 | } __WLAN_ATTRIB_PACK__ hfa384x_PSUserCount_t; | 1924 | } __attribute__((packed)) hfa384x_PSUserCount_t; |
1925 | 1925 | ||
1926 | typedef struct hfa384x_KeyIDChanged | 1926 | typedef struct hfa384x_KeyIDChanged |
1927 | { | 1927 | { |
1928 | u8 sta_addr[WLAN_ADDR_LEN]; | 1928 | u8 sta_addr[WLAN_ADDR_LEN]; |
1929 | u16 keyid; | 1929 | u16 keyid; |
1930 | } __WLAN_ATTRIB_PACK__ hfa384x_KeyIDChanged_t; | 1930 | } __attribute__((packed)) hfa384x_KeyIDChanged_t; |
1931 | 1931 | ||
1932 | /*-- Collection of all Inf frames ---------------*/ | 1932 | /*-- Collection of all Inf frames ---------------*/ |
1933 | typedef union hfa384x_infodata { | 1933 | typedef union hfa384x_infodata { |
@@ -1941,14 +1941,14 @@ typedef union hfa384x_infodata { | |||
1941 | hfa384x_AuthReq_t authreq; | 1941 | hfa384x_AuthReq_t authreq; |
1942 | hfa384x_PSUserCount_t psusercnt; | 1942 | hfa384x_PSUserCount_t psusercnt; |
1943 | hfa384x_KeyIDChanged_t keyidchanged; | 1943 | hfa384x_KeyIDChanged_t keyidchanged; |
1944 | } __WLAN_ATTRIB_PACK__ hfa384x_infodata_t; | 1944 | } __attribute__((packed)) hfa384x_infodata_t; |
1945 | 1945 | ||
1946 | typedef struct hfa384x_InfFrame | 1946 | typedef struct hfa384x_InfFrame |
1947 | { | 1947 | { |
1948 | u16 framelen; | 1948 | u16 framelen; |
1949 | u16 infotype; | 1949 | u16 infotype; |
1950 | hfa384x_infodata_t info; | 1950 | hfa384x_infodata_t info; |
1951 | } __WLAN_ATTRIB_PACK__ hfa384x_InfFrame_t; | 1951 | } __attribute__((packed)) hfa384x_InfFrame_t; |
1952 | 1952 | ||
1953 | /*-------------------------------------------------------------------- | 1953 | /*-------------------------------------------------------------------- |
1954 | USB Packet structures and constants. | 1954 | USB Packet structures and constants. |
@@ -1984,7 +1984,7 @@ USB Packet structures and constants. | |||
1984 | typedef struct hfa384x_usb_txfrm { | 1984 | typedef struct hfa384x_usb_txfrm { |
1985 | hfa384x_tx_frame_t desc; | 1985 | hfa384x_tx_frame_t desc; |
1986 | u8 data[WLAN_DATA_MAXLEN]; | 1986 | u8 data[WLAN_DATA_MAXLEN]; |
1987 | } __WLAN_ATTRIB_PACK__ hfa384x_usb_txfrm_t; | 1987 | } __attribute__((packed)) hfa384x_usb_txfrm_t; |
1988 | 1988 | ||
1989 | typedef struct hfa384x_usb_cmdreq { | 1989 | typedef struct hfa384x_usb_cmdreq { |
1990 | u16 type; | 1990 | u16 type; |
@@ -1993,21 +1993,21 @@ typedef struct hfa384x_usb_cmdreq { | |||
1993 | u16 parm1; | 1993 | u16 parm1; |
1994 | u16 parm2; | 1994 | u16 parm2; |
1995 | u8 pad[54]; | 1995 | u8 pad[54]; |
1996 | } __WLAN_ATTRIB_PACK__ hfa384x_usb_cmdreq_t; | 1996 | } __attribute__((packed)) hfa384x_usb_cmdreq_t; |
1997 | 1997 | ||
1998 | typedef struct hfa384x_usb_wridreq { | 1998 | typedef struct hfa384x_usb_wridreq { |
1999 | u16 type; | 1999 | u16 type; |
2000 | u16 frmlen; | 2000 | u16 frmlen; |
2001 | u16 rid; | 2001 | u16 rid; |
2002 | u8 data[HFA384x_RIDDATA_MAXLEN]; | 2002 | u8 data[HFA384x_RIDDATA_MAXLEN]; |
2003 | } __WLAN_ATTRIB_PACK__ hfa384x_usb_wridreq_t; | 2003 | } __attribute__((packed)) hfa384x_usb_wridreq_t; |
2004 | 2004 | ||
2005 | typedef struct hfa384x_usb_rridreq { | 2005 | typedef struct hfa384x_usb_rridreq { |
2006 | u16 type; | 2006 | u16 type; |
2007 | u16 frmlen; | 2007 | u16 frmlen; |
2008 | u16 rid; | 2008 | u16 rid; |
2009 | u8 pad[58]; | 2009 | u8 pad[58]; |
2010 | } __WLAN_ATTRIB_PACK__ hfa384x_usb_rridreq_t; | 2010 | } __attribute__((packed)) hfa384x_usb_rridreq_t; |
2011 | 2011 | ||
2012 | typedef struct hfa384x_usb_wmemreq { | 2012 | typedef struct hfa384x_usb_wmemreq { |
2013 | u16 type; | 2013 | u16 type; |
@@ -2015,7 +2015,7 @@ typedef struct hfa384x_usb_wmemreq { | |||
2015 | u16 offset; | 2015 | u16 offset; |
2016 | u16 page; | 2016 | u16 page; |
2017 | u8 data[HFA384x_USB_RWMEM_MAXLEN]; | 2017 | u8 data[HFA384x_USB_RWMEM_MAXLEN]; |
2018 | } __WLAN_ATTRIB_PACK__ hfa384x_usb_wmemreq_t; | 2018 | } __attribute__((packed)) hfa384x_usb_wmemreq_t; |
2019 | 2019 | ||
2020 | typedef struct hfa384x_usb_rmemreq { | 2020 | typedef struct hfa384x_usb_rmemreq { |
2021 | u16 type; | 2021 | u16 type; |
@@ -2023,7 +2023,7 @@ typedef struct hfa384x_usb_rmemreq { | |||
2023 | u16 offset; | 2023 | u16 offset; |
2024 | u16 page; | 2024 | u16 page; |
2025 | u8 pad[56]; | 2025 | u8 pad[56]; |
2026 | } __WLAN_ATTRIB_PACK__ hfa384x_usb_rmemreq_t; | 2026 | } __attribute__((packed)) hfa384x_usb_rmemreq_t; |
2027 | 2027 | ||
2028 | /*------------------------------------*/ | 2028 | /*------------------------------------*/ |
2029 | /* Response (bulk IN) packet contents */ | 2029 | /* Response (bulk IN) packet contents */ |
@@ -2031,12 +2031,12 @@ typedef struct hfa384x_usb_rmemreq { | |||
2031 | typedef struct hfa384x_usb_rxfrm { | 2031 | typedef struct hfa384x_usb_rxfrm { |
2032 | hfa384x_rx_frame_t desc; | 2032 | hfa384x_rx_frame_t desc; |
2033 | u8 data[WLAN_DATA_MAXLEN]; | 2033 | u8 data[WLAN_DATA_MAXLEN]; |
2034 | } __WLAN_ATTRIB_PACK__ hfa384x_usb_rxfrm_t; | 2034 | } __attribute__((packed)) hfa384x_usb_rxfrm_t; |
2035 | 2035 | ||
2036 | typedef struct hfa384x_usb_infofrm { | 2036 | typedef struct hfa384x_usb_infofrm { |
2037 | u16 type; | 2037 | u16 type; |
2038 | hfa384x_InfFrame_t info; | 2038 | hfa384x_InfFrame_t info; |
2039 | } __WLAN_ATTRIB_PACK__ hfa384x_usb_infofrm_t; | 2039 | } __attribute__((packed)) hfa384x_usb_infofrm_t; |
2040 | 2040 | ||
2041 | typedef struct hfa384x_usb_statusresp { | 2041 | typedef struct hfa384x_usb_statusresp { |
2042 | u16 type; | 2042 | u16 type; |
@@ -2044,7 +2044,7 @@ typedef struct hfa384x_usb_statusresp { | |||
2044 | u16 resp0; | 2044 | u16 resp0; |
2045 | u16 resp1; | 2045 | u16 resp1; |
2046 | u16 resp2; | 2046 | u16 resp2; |
2047 | } __WLAN_ATTRIB_PACK__ hfa384x_usb_cmdresp_t; | 2047 | } __attribute__((packed)) hfa384x_usb_cmdresp_t; |
2048 | 2048 | ||
2049 | typedef hfa384x_usb_cmdresp_t hfa384x_usb_wridresp_t; | 2049 | typedef hfa384x_usb_cmdresp_t hfa384x_usb_wridresp_t; |
2050 | 2050 | ||
@@ -2053,7 +2053,7 @@ typedef struct hfa384x_usb_rridresp { | |||
2053 | u16 frmlen; | 2053 | u16 frmlen; |
2054 | u16 rid; | 2054 | u16 rid; |
2055 | u8 data[HFA384x_RIDDATA_MAXLEN]; | 2055 | u8 data[HFA384x_RIDDATA_MAXLEN]; |
2056 | } __WLAN_ATTRIB_PACK__ hfa384x_usb_rridresp_t; | 2056 | } __attribute__((packed)) hfa384x_usb_rridresp_t; |
2057 | 2057 | ||
2058 | typedef hfa384x_usb_cmdresp_t hfa384x_usb_wmemresp_t; | 2058 | typedef hfa384x_usb_cmdresp_t hfa384x_usb_wmemresp_t; |
2059 | 2059 | ||
@@ -2061,17 +2061,17 @@ typedef struct hfa384x_usb_rmemresp { | |||
2061 | u16 type; | 2061 | u16 type; |
2062 | u16 frmlen; | 2062 | u16 frmlen; |
2063 | u8 data[HFA384x_USB_RWMEM_MAXLEN]; | 2063 | u8 data[HFA384x_USB_RWMEM_MAXLEN]; |
2064 | } __WLAN_ATTRIB_PACK__ hfa384x_usb_rmemresp_t; | 2064 | } __attribute__((packed)) hfa384x_usb_rmemresp_t; |
2065 | 2065 | ||
2066 | typedef struct hfa384x_usb_bufavail { | 2066 | typedef struct hfa384x_usb_bufavail { |
2067 | u16 type; | 2067 | u16 type; |
2068 | u16 frmlen; | 2068 | u16 frmlen; |
2069 | } __WLAN_ATTRIB_PACK__ hfa384x_usb_bufavail_t; | 2069 | } __attribute__((packed)) hfa384x_usb_bufavail_t; |
2070 | 2070 | ||
2071 | typedef struct hfa384x_usb_error { | 2071 | typedef struct hfa384x_usb_error { |
2072 | u16 type; | 2072 | u16 type; |
2073 | u16 errortype; | 2073 | u16 errortype; |
2074 | } __WLAN_ATTRIB_PACK__ hfa384x_usb_error_t; | 2074 | } __attribute__((packed)) hfa384x_usb_error_t; |
2075 | 2075 | ||
2076 | /*----------------------------------------------------------*/ | 2076 | /*----------------------------------------------------------*/ |
2077 | /* Unions for packaging all the known packet types together */ | 2077 | /* Unions for packaging all the known packet types together */ |
@@ -2084,7 +2084,7 @@ typedef union hfa384x_usbout { | |||
2084 | hfa384x_usb_rridreq_t rridreq; | 2084 | hfa384x_usb_rridreq_t rridreq; |
2085 | hfa384x_usb_wmemreq_t wmemreq; | 2085 | hfa384x_usb_wmemreq_t wmemreq; |
2086 | hfa384x_usb_rmemreq_t rmemreq; | 2086 | hfa384x_usb_rmemreq_t rmemreq; |
2087 | } __WLAN_ATTRIB_PACK__ hfa384x_usbout_t; | 2087 | } __attribute__((packed)) hfa384x_usbout_t; |
2088 | 2088 | ||
2089 | typedef union hfa384x_usbin { | 2089 | typedef union hfa384x_usbin { |
2090 | u16 type; | 2090 | u16 type; |
@@ -2099,7 +2099,7 @@ typedef union hfa384x_usbin { | |||
2099 | hfa384x_usb_bufavail_t bufavail; | 2099 | hfa384x_usb_bufavail_t bufavail; |
2100 | hfa384x_usb_error_t usberror; | 2100 | hfa384x_usb_error_t usberror; |
2101 | u8 boguspad[3000]; | 2101 | u8 boguspad[3000]; |
2102 | } __WLAN_ATTRIB_PACK__ hfa384x_usbin_t; | 2102 | } __attribute__((packed)) hfa384x_usbin_t; |
2103 | 2103 | ||
2104 | /*-------------------------------------------------------------------- | 2104 | /*-------------------------------------------------------------------- |
2105 | PD record structures. | 2105 | PD record structures. |
@@ -2108,17 +2108,17 @@ PD record structures. | |||
2108 | typedef struct hfa384x_pdr_pcb_partnum | 2108 | typedef struct hfa384x_pdr_pcb_partnum |
2109 | { | 2109 | { |
2110 | u8 num[8]; | 2110 | u8 num[8]; |
2111 | } __WLAN_ATTRIB_PACK__ hfa384x_pdr_pcb_partnum_t; | 2111 | } __attribute__((packed)) hfa384x_pdr_pcb_partnum_t; |
2112 | 2112 | ||
2113 | typedef struct hfa384x_pdr_pcb_tracenum | 2113 | typedef struct hfa384x_pdr_pcb_tracenum |
2114 | { | 2114 | { |
2115 | u8 num[8]; | 2115 | u8 num[8]; |
2116 | } __WLAN_ATTRIB_PACK__ hfa384x_pdr_pcb_tracenum_t; | 2116 | } __attribute__((packed)) hfa384x_pdr_pcb_tracenum_t; |
2117 | 2117 | ||
2118 | typedef struct hfa384x_pdr_nic_serial | 2118 | typedef struct hfa384x_pdr_nic_serial |
2119 | { | 2119 | { |
2120 | u8 num[12]; | 2120 | u8 num[12]; |
2121 | } __WLAN_ATTRIB_PACK__ hfa384x_pdr_nic_serial_t; | 2121 | } __attribute__((packed)) hfa384x_pdr_nic_serial_t; |
2122 | 2122 | ||
2123 | typedef struct hfa384x_pdr_mkk_measurements | 2123 | typedef struct hfa384x_pdr_mkk_measurements |
2124 | { | 2124 | { |
@@ -2137,12 +2137,12 @@ typedef struct hfa384x_pdr_mkk_measurements | |||
2137 | double rx_spur_f2; | 2137 | double rx_spur_f2; |
2138 | double rx_spur_l1; | 2138 | double rx_spur_l1; |
2139 | double rx_spur_l2; | 2139 | double rx_spur_l2; |
2140 | } __WLAN_ATTRIB_PACK__ hfa384x_pdr_mkk_measurements_t; | 2140 | } __attribute__((packed)) hfa384x_pdr_mkk_measurements_t; |
2141 | 2141 | ||
2142 | typedef struct hfa384x_pdr_nic_ramsize | 2142 | typedef struct hfa384x_pdr_nic_ramsize |
2143 | { | 2143 | { |
2144 | u8 size[12]; /* units of KB */ | 2144 | u8 size[12]; /* units of KB */ |
2145 | } __WLAN_ATTRIB_PACK__ hfa384x_pdr_nic_ramsize_t; | 2145 | } __attribute__((packed)) hfa384x_pdr_nic_ramsize_t; |
2146 | 2146 | ||
2147 | typedef struct hfa384x_pdr_mfisuprange | 2147 | typedef struct hfa384x_pdr_mfisuprange |
2148 | { | 2148 | { |
@@ -2150,7 +2150,7 @@ typedef struct hfa384x_pdr_mfisuprange | |||
2150 | u16 variant; | 2150 | u16 variant; |
2151 | u16 bottom; | 2151 | u16 bottom; |
2152 | u16 top; | 2152 | u16 top; |
2153 | } __WLAN_ATTRIB_PACK__ hfa384x_pdr_mfisuprange_t; | 2153 | } __attribute__((packed)) hfa384x_pdr_mfisuprange_t; |
2154 | 2154 | ||
2155 | typedef struct hfa384x_pdr_cfisuprange | 2155 | typedef struct hfa384x_pdr_cfisuprange |
2156 | { | 2156 | { |
@@ -2158,7 +2158,7 @@ typedef struct hfa384x_pdr_cfisuprange | |||
2158 | u16 variant; | 2158 | u16 variant; |
2159 | u16 bottom; | 2159 | u16 bottom; |
2160 | u16 top; | 2160 | u16 top; |
2161 | } __WLAN_ATTRIB_PACK__ hfa384x_pdr_cfisuprange_t; | 2161 | } __attribute__((packed)) hfa384x_pdr_cfisuprange_t; |
2162 | 2162 | ||
2163 | typedef struct hfa384x_pdr_nicid | 2163 | typedef struct hfa384x_pdr_nicid |
2164 | { | 2164 | { |
@@ -2166,140 +2166,140 @@ typedef struct hfa384x_pdr_nicid | |||
2166 | u16 variant; | 2166 | u16 variant; |
2167 | u16 major; | 2167 | u16 major; |
2168 | u16 minor; | 2168 | u16 minor; |
2169 | } __WLAN_ATTRIB_PACK__ hfa384x_pdr_nicid_t; | 2169 | } __attribute__((packed)) hfa384x_pdr_nicid_t; |
2170 | 2170 | ||
2171 | 2171 | ||
2172 | typedef struct hfa384x_pdr_refdac_measurements | 2172 | typedef struct hfa384x_pdr_refdac_measurements |
2173 | { | 2173 | { |
2174 | u16 value[0]; | 2174 | u16 value[0]; |
2175 | } __WLAN_ATTRIB_PACK__ hfa384x_pdr_refdac_measurements_t; | 2175 | } __attribute__((packed)) hfa384x_pdr_refdac_measurements_t; |
2176 | 2176 | ||
2177 | typedef struct hfa384x_pdr_vgdac_measurements | 2177 | typedef struct hfa384x_pdr_vgdac_measurements |
2178 | { | 2178 | { |
2179 | u16 value[0]; | 2179 | u16 value[0]; |
2180 | } __WLAN_ATTRIB_PACK__ hfa384x_pdr_vgdac_measurements_t; | 2180 | } __attribute__((packed)) hfa384x_pdr_vgdac_measurements_t; |
2181 | 2181 | ||
2182 | typedef struct hfa384x_pdr_level_comp_measurements | 2182 | typedef struct hfa384x_pdr_level_comp_measurements |
2183 | { | 2183 | { |
2184 | u16 value[0]; | 2184 | u16 value[0]; |
2185 | } __WLAN_ATTRIB_PACK__ hfa384x_pdr_level_compc_measurements_t; | 2185 | } __attribute__((packed)) hfa384x_pdr_level_compc_measurements_t; |
2186 | 2186 | ||
2187 | typedef struct hfa384x_pdr_mac_address | 2187 | typedef struct hfa384x_pdr_mac_address |
2188 | { | 2188 | { |
2189 | u8 addr[6]; | 2189 | u8 addr[6]; |
2190 | } __WLAN_ATTRIB_PACK__ hfa384x_pdr_mac_address_t; | 2190 | } __attribute__((packed)) hfa384x_pdr_mac_address_t; |
2191 | 2191 | ||
2192 | typedef struct hfa384x_pdr_mkk_callname | 2192 | typedef struct hfa384x_pdr_mkk_callname |
2193 | { | 2193 | { |
2194 | u8 callname[8]; | 2194 | u8 callname[8]; |
2195 | } __WLAN_ATTRIB_PACK__ hfa384x_pdr_mkk_callname_t; | 2195 | } __attribute__((packed)) hfa384x_pdr_mkk_callname_t; |
2196 | 2196 | ||
2197 | typedef struct hfa384x_pdr_regdomain | 2197 | typedef struct hfa384x_pdr_regdomain |
2198 | { | 2198 | { |
2199 | u16 numdomains; | 2199 | u16 numdomains; |
2200 | u16 domain[5]; | 2200 | u16 domain[5]; |
2201 | } __WLAN_ATTRIB_PACK__ hfa384x_pdr_regdomain_t; | 2201 | } __attribute__((packed)) hfa384x_pdr_regdomain_t; |
2202 | 2202 | ||
2203 | typedef struct hfa384x_pdr_allowed_channel | 2203 | typedef struct hfa384x_pdr_allowed_channel |
2204 | { | 2204 | { |
2205 | u16 ch_bitmap; | 2205 | u16 ch_bitmap; |
2206 | } __WLAN_ATTRIB_PACK__ hfa384x_pdr_allowed_channel_t; | 2206 | } __attribute__((packed)) hfa384x_pdr_allowed_channel_t; |
2207 | 2207 | ||
2208 | typedef struct hfa384x_pdr_default_channel | 2208 | typedef struct hfa384x_pdr_default_channel |
2209 | { | 2209 | { |
2210 | u16 channel; | 2210 | u16 channel; |
2211 | } __WLAN_ATTRIB_PACK__ hfa384x_pdr_default_channel_t; | 2211 | } __attribute__((packed)) hfa384x_pdr_default_channel_t; |
2212 | 2212 | ||
2213 | typedef struct hfa384x_pdr_privacy_option | 2213 | typedef struct hfa384x_pdr_privacy_option |
2214 | { | 2214 | { |
2215 | u16 available; | 2215 | u16 available; |
2216 | } __WLAN_ATTRIB_PACK__ hfa384x_pdr_privacy_option_t; | 2216 | } __attribute__((packed)) hfa384x_pdr_privacy_option_t; |
2217 | 2217 | ||
2218 | typedef struct hfa384x_pdr_temptype | 2218 | typedef struct hfa384x_pdr_temptype |
2219 | { | 2219 | { |
2220 | u16 type; | 2220 | u16 type; |
2221 | } __WLAN_ATTRIB_PACK__ hfa384x_pdr_temptype_t; | 2221 | } __attribute__((packed)) hfa384x_pdr_temptype_t; |
2222 | 2222 | ||
2223 | typedef struct hfa384x_pdr_refdac_setup | 2223 | typedef struct hfa384x_pdr_refdac_setup |
2224 | { | 2224 | { |
2225 | u16 ch_value[14]; | 2225 | u16 ch_value[14]; |
2226 | } __WLAN_ATTRIB_PACK__ hfa384x_pdr_refdac_setup_t; | 2226 | } __attribute__((packed)) hfa384x_pdr_refdac_setup_t; |
2227 | 2227 | ||
2228 | typedef struct hfa384x_pdr_vgdac_setup | 2228 | typedef struct hfa384x_pdr_vgdac_setup |
2229 | { | 2229 | { |
2230 | u16 ch_value[14]; | 2230 | u16 ch_value[14]; |
2231 | } __WLAN_ATTRIB_PACK__ hfa384x_pdr_vgdac_setup_t; | 2231 | } __attribute__((packed)) hfa384x_pdr_vgdac_setup_t; |
2232 | 2232 | ||
2233 | typedef struct hfa384x_pdr_level_comp_setup | 2233 | typedef struct hfa384x_pdr_level_comp_setup |
2234 | { | 2234 | { |
2235 | u16 ch_value[14]; | 2235 | u16 ch_value[14]; |
2236 | } __WLAN_ATTRIB_PACK__ hfa384x_pdr_level_comp_setup_t; | 2236 | } __attribute__((packed)) hfa384x_pdr_level_comp_setup_t; |
2237 | 2237 | ||
2238 | typedef struct hfa384x_pdr_trimdac_setup | 2238 | typedef struct hfa384x_pdr_trimdac_setup |
2239 | { | 2239 | { |
2240 | u16 trimidac; | 2240 | u16 trimidac; |
2241 | u16 trimqdac; | 2241 | u16 trimqdac; |
2242 | } __WLAN_ATTRIB_PACK__ hfa384x_pdr_trimdac_setup_t; | 2242 | } __attribute__((packed)) hfa384x_pdr_trimdac_setup_t; |
2243 | 2243 | ||
2244 | typedef struct hfa384x_pdr_ifr_setting | 2244 | typedef struct hfa384x_pdr_ifr_setting |
2245 | { | 2245 | { |
2246 | u16 value[3]; | 2246 | u16 value[3]; |
2247 | } __WLAN_ATTRIB_PACK__ hfa384x_pdr_ifr_setting_t; | 2247 | } __attribute__((packed)) hfa384x_pdr_ifr_setting_t; |
2248 | 2248 | ||
2249 | typedef struct hfa384x_pdr_rfr_setting | 2249 | typedef struct hfa384x_pdr_rfr_setting |
2250 | { | 2250 | { |
2251 | u16 value[3]; | 2251 | u16 value[3]; |
2252 | } __WLAN_ATTRIB_PACK__ hfa384x_pdr_rfr_setting_t; | 2252 | } __attribute__((packed)) hfa384x_pdr_rfr_setting_t; |
2253 | 2253 | ||
2254 | typedef struct hfa384x_pdr_hfa3861_baseline | 2254 | typedef struct hfa384x_pdr_hfa3861_baseline |
2255 | { | 2255 | { |
2256 | u16 value[50]; | 2256 | u16 value[50]; |
2257 | } __WLAN_ATTRIB_PACK__ hfa384x_pdr_hfa3861_baseline_t; | 2257 | } __attribute__((packed)) hfa384x_pdr_hfa3861_baseline_t; |
2258 | 2258 | ||
2259 | typedef struct hfa384x_pdr_hfa3861_shadow | 2259 | typedef struct hfa384x_pdr_hfa3861_shadow |
2260 | { | 2260 | { |
2261 | u32 value[32]; | 2261 | u32 value[32]; |
2262 | } __WLAN_ATTRIB_PACK__ hfa384x_pdr_hfa3861_shadow_t; | 2262 | } __attribute__((packed)) hfa384x_pdr_hfa3861_shadow_t; |
2263 | 2263 | ||
2264 | typedef struct hfa384x_pdr_hfa3861_ifrf | 2264 | typedef struct hfa384x_pdr_hfa3861_ifrf |
2265 | { | 2265 | { |
2266 | u32 value[20]; | 2266 | u32 value[20]; |
2267 | } __WLAN_ATTRIB_PACK__ hfa384x_pdr_hfa3861_ifrf_t; | 2267 | } __attribute__((packed)) hfa384x_pdr_hfa3861_ifrf_t; |
2268 | 2268 | ||
2269 | typedef struct hfa384x_pdr_hfa3861_chcalsp | 2269 | typedef struct hfa384x_pdr_hfa3861_chcalsp |
2270 | { | 2270 | { |
2271 | u16 value[14]; | 2271 | u16 value[14]; |
2272 | } __WLAN_ATTRIB_PACK__ hfa384x_pdr_hfa3861_chcalsp_t; | 2272 | } __attribute__((packed)) hfa384x_pdr_hfa3861_chcalsp_t; |
2273 | 2273 | ||
2274 | typedef struct hfa384x_pdr_hfa3861_chcali | 2274 | typedef struct hfa384x_pdr_hfa3861_chcali |
2275 | { | 2275 | { |
2276 | u16 value[17]; | 2276 | u16 value[17]; |
2277 | } __WLAN_ATTRIB_PACK__ hfa384x_pdr_hfa3861_chcali_t; | 2277 | } __attribute__((packed)) hfa384x_pdr_hfa3861_chcali_t; |
2278 | 2278 | ||
2279 | typedef struct hfa384x_pdr_hfa3861_nic_config | 2279 | typedef struct hfa384x_pdr_hfa3861_nic_config |
2280 | { | 2280 | { |
2281 | u16 config_bitmap; | 2281 | u16 config_bitmap; |
2282 | } __WLAN_ATTRIB_PACK__ hfa384x_pdr_nic_config_t; | 2282 | } __attribute__((packed)) hfa384x_pdr_nic_config_t; |
2283 | 2283 | ||
2284 | typedef struct hfa384x_pdr_hfo_delay | 2284 | typedef struct hfa384x_pdr_hfo_delay |
2285 | { | 2285 | { |
2286 | u8 hfo_delay; | 2286 | u8 hfo_delay; |
2287 | } __WLAN_ATTRIB_PACK__ hfa384x_hfo_delay_t; | 2287 | } __attribute__((packed)) hfa384x_hfo_delay_t; |
2288 | 2288 | ||
2289 | typedef struct hfa384x_pdr_hfa3861_manf_testsp | 2289 | typedef struct hfa384x_pdr_hfa3861_manf_testsp |
2290 | { | 2290 | { |
2291 | u16 value[30]; | 2291 | u16 value[30]; |
2292 | } __WLAN_ATTRIB_PACK__ hfa384x_pdr_hfa3861_manf_testsp_t; | 2292 | } __attribute__((packed)) hfa384x_pdr_hfa3861_manf_testsp_t; |
2293 | 2293 | ||
2294 | typedef struct hfa384x_pdr_hfa3861_manf_testi | 2294 | typedef struct hfa384x_pdr_hfa3861_manf_testi |
2295 | { | 2295 | { |
2296 | u16 value[30]; | 2296 | u16 value[30]; |
2297 | } __WLAN_ATTRIB_PACK__ hfa384x_pdr_hfa3861_manf_testi_t; | 2297 | } __attribute__((packed)) hfa384x_pdr_hfa3861_manf_testi_t; |
2298 | 2298 | ||
2299 | typedef struct hfa384x_end_of_pda | 2299 | typedef struct hfa384x_end_of_pda |
2300 | { | 2300 | { |
2301 | u16 crc; | 2301 | u16 crc; |
2302 | } __WLAN_ATTRIB_PACK__ hfa384x_pdr_end_of_pda_t; | 2302 | } __attribute__((packed)) hfa384x_pdr_end_of_pda_t; |
2303 | 2303 | ||
2304 | typedef struct hfa384x_pdrec | 2304 | typedef struct hfa384x_pdrec |
2305 | { | 2305 | { |
@@ -2342,7 +2342,7 @@ typedef struct hfa384x_pdrec | |||
2342 | hfa384x_pdr_end_of_pda_t end_of_pda; | 2342 | hfa384x_pdr_end_of_pda_t end_of_pda; |
2343 | 2343 | ||
2344 | } data; | 2344 | } data; |
2345 | } __WLAN_ATTRIB_PACK__ hfa384x_pdrec_t; | 2345 | } __attribute__((packed)) hfa384x_pdrec_t; |
2346 | 2346 | ||
2347 | 2347 | ||
2348 | #ifdef __KERNEL__ | 2348 | #ifdef __KERNEL__ |
diff --git a/drivers/staging/wlan-ng/p80211conv.h b/drivers/staging/wlan-ng/p80211conv.h index 538e9bd1490..d5e88067913 100644 --- a/drivers/staging/wlan-ng/p80211conv.h +++ b/drivers/staging/wlan-ng/p80211conv.h | |||
@@ -148,7 +148,7 @@ typedef struct wlan_ethhdr | |||
148 | u8 daddr[WLAN_ETHADDR_LEN]; | 148 | u8 daddr[WLAN_ETHADDR_LEN]; |
149 | u8 saddr[WLAN_ETHADDR_LEN]; | 149 | u8 saddr[WLAN_ETHADDR_LEN]; |
150 | u16 type; | 150 | u16 type; |
151 | } __WLAN_ATTRIB_PACK__ wlan_ethhdr_t; | 151 | } __attribute__((packed)) wlan_ethhdr_t; |
152 | 152 | ||
153 | /* local llc header type */ | 153 | /* local llc header type */ |
154 | typedef struct wlan_llc | 154 | typedef struct wlan_llc |
@@ -156,14 +156,14 @@ typedef struct wlan_llc | |||
156 | u8 dsap; | 156 | u8 dsap; |
157 | u8 ssap; | 157 | u8 ssap; |
158 | u8 ctl; | 158 | u8 ctl; |
159 | } __WLAN_ATTRIB_PACK__ wlan_llc_t; | 159 | } __attribute__((packed)) wlan_llc_t; |
160 | 160 | ||
161 | /* local snap header type */ | 161 | /* local snap header type */ |
162 | typedef struct wlan_snap | 162 | typedef struct wlan_snap |
163 | { | 163 | { |
164 | u8 oui[WLAN_IEEE_OUI_LEN]; | 164 | u8 oui[WLAN_IEEE_OUI_LEN]; |
165 | u16 type; | 165 | u16 type; |
166 | } __WLAN_ATTRIB_PACK__ wlan_snap_t; | 166 | } __attribute__((packed)) wlan_snap_t; |
167 | 167 | ||
168 | /* Circular include trick */ | 168 | /* Circular include trick */ |
169 | struct wlandevice; | 169 | struct wlandevice; |
diff --git a/drivers/staging/wlan-ng/p80211hdr.h b/drivers/staging/wlan-ng/p80211hdr.h index 72f12aff390..f4a1a34ff0a 100644 --- a/drivers/staging/wlan-ng/p80211hdr.h +++ b/drivers/staging/wlan-ng/p80211hdr.h | |||
@@ -229,7 +229,7 @@ typedef struct p80211_hdr_a3 | |||
229 | u8 a2[WLAN_ADDR_LEN]; | 229 | u8 a2[WLAN_ADDR_LEN]; |
230 | u8 a3[WLAN_ADDR_LEN]; | 230 | u8 a3[WLAN_ADDR_LEN]; |
231 | u16 seq; | 231 | u16 seq; |
232 | } __WLAN_ATTRIB_PACK__ p80211_hdr_a3_t; | 232 | } __attribute__((packed)) p80211_hdr_a3_t; |
233 | 233 | ||
234 | typedef struct p80211_hdr_a4 | 234 | typedef struct p80211_hdr_a4 |
235 | { | 235 | { |
@@ -240,13 +240,13 @@ typedef struct p80211_hdr_a4 | |||
240 | u8 a3[WLAN_ADDR_LEN]; | 240 | u8 a3[WLAN_ADDR_LEN]; |
241 | u16 seq; | 241 | u16 seq; |
242 | u8 a4[WLAN_ADDR_LEN]; | 242 | u8 a4[WLAN_ADDR_LEN]; |
243 | } __WLAN_ATTRIB_PACK__ p80211_hdr_a4_t; | 243 | } __attribute__((packed)) p80211_hdr_a4_t; |
244 | 244 | ||
245 | typedef union p80211_hdr | 245 | typedef union p80211_hdr |
246 | { | 246 | { |
247 | p80211_hdr_a3_t a3; | 247 | p80211_hdr_a3_t a3; |
248 | p80211_hdr_a4_t a4; | 248 | p80211_hdr_a4_t a4; |
249 | } __WLAN_ATTRIB_PACK__ p80211_hdr_t; | 249 | } __attribute__((packed)) p80211_hdr_t; |
250 | 250 | ||
251 | 251 | ||
252 | /*================================================================*/ | 252 | /*================================================================*/ |
diff --git a/drivers/staging/wlan-ng/p80211ioctl.h b/drivers/staging/wlan-ng/p80211ioctl.h index ad67b698fa4..e9795a5a56f 100644 --- a/drivers/staging/wlan-ng/p80211ioctl.h +++ b/drivers/staging/wlan-ng/p80211ioctl.h | |||
@@ -109,7 +109,7 @@ typedef struct p80211ioctl_req | |||
109 | u32 magic; | 109 | u32 magic; |
110 | u16 len; | 110 | u16 len; |
111 | u32 result; | 111 | u32 result; |
112 | } __WLAN_ATTRIB_PACK__ p80211ioctl_req_t; | 112 | } __attribute__((packed)) p80211ioctl_req_t; |
113 | 113 | ||
114 | 114 | ||
115 | /*================================================================*/ | 115 | /*================================================================*/ |
diff --git a/drivers/staging/wlan-ng/p80211metastruct.h b/drivers/staging/wlan-ng/p80211metastruct.h index d2258b0e89c..9bc4f85ff8e 100644 --- a/drivers/staging/wlan-ng/p80211metastruct.h +++ b/drivers/staging/wlan-ng/p80211metastruct.h | |||
@@ -55,7 +55,7 @@ typedef struct p80211msg_dot11req_mibget | |||
55 | u8 devname[WLAN_DEVNAMELEN_MAX] ; | 55 | u8 devname[WLAN_DEVNAMELEN_MAX] ; |
56 | p80211item_unk392_t mibattribute ; | 56 | p80211item_unk392_t mibattribute ; |
57 | p80211item_uint32_t resultcode ; | 57 | p80211item_uint32_t resultcode ; |
58 | } __WLAN_ATTRIB_PACK__ p80211msg_dot11req_mibget_t; | 58 | } __attribute__((packed)) p80211msg_dot11req_mibget_t; |
59 | 59 | ||
60 | typedef struct p80211msg_dot11req_mibset | 60 | typedef struct p80211msg_dot11req_mibset |
61 | { | 61 | { |
@@ -64,7 +64,7 @@ typedef struct p80211msg_dot11req_mibset | |||
64 | u8 devname[WLAN_DEVNAMELEN_MAX] ; | 64 | u8 devname[WLAN_DEVNAMELEN_MAX] ; |
65 | p80211item_unk392_t mibattribute ; | 65 | p80211item_unk392_t mibattribute ; |
66 | p80211item_uint32_t resultcode ; | 66 | p80211item_uint32_t resultcode ; |
67 | } __WLAN_ATTRIB_PACK__ p80211msg_dot11req_mibset_t; | 67 | } __attribute__((packed)) p80211msg_dot11req_mibset_t; |
68 | 68 | ||
69 | typedef struct p80211msg_dot11req_scan | 69 | typedef struct p80211msg_dot11req_scan |
70 | { | 70 | { |
@@ -85,7 +85,7 @@ typedef struct p80211msg_dot11req_scan | |||
85 | p80211item_uint32_t resultcode ; | 85 | p80211item_uint32_t resultcode ; |
86 | p80211item_uint32_t numbss ; | 86 | p80211item_uint32_t numbss ; |
87 | p80211item_uint32_t append ; | 87 | p80211item_uint32_t append ; |
88 | } __WLAN_ATTRIB_PACK__ p80211msg_dot11req_scan_t; | 88 | } __attribute__((packed)) p80211msg_dot11req_scan_t; |
89 | 89 | ||
90 | typedef struct p80211msg_dot11req_scan_results | 90 | typedef struct p80211msg_dot11req_scan_results |
91 | { | 91 | { |
@@ -134,7 +134,7 @@ typedef struct p80211msg_dot11req_scan_results | |||
134 | p80211item_uint32_t supprate6 ; | 134 | p80211item_uint32_t supprate6 ; |
135 | p80211item_uint32_t supprate7 ; | 135 | p80211item_uint32_t supprate7 ; |
136 | p80211item_uint32_t supprate8 ; | 136 | p80211item_uint32_t supprate8 ; |
137 | } __WLAN_ATTRIB_PACK__ p80211msg_dot11req_scan_results_t; | 137 | } __attribute__((packed)) p80211msg_dot11req_scan_results_t; |
138 | 138 | ||
139 | typedef struct p80211msg_dot11req_start | 139 | typedef struct p80211msg_dot11req_start |
140 | { | 140 | { |
@@ -173,7 +173,7 @@ typedef struct p80211msg_dot11req_start | |||
173 | p80211item_uint32_t operationalrate7 ; | 173 | p80211item_uint32_t operationalrate7 ; |
174 | p80211item_uint32_t operationalrate8 ; | 174 | p80211item_uint32_t operationalrate8 ; |
175 | p80211item_uint32_t resultcode ; | 175 | p80211item_uint32_t resultcode ; |
176 | } __WLAN_ATTRIB_PACK__ p80211msg_dot11req_start_t; | 176 | } __attribute__((packed)) p80211msg_dot11req_start_t; |
177 | 177 | ||
178 | typedef struct p80211msg_lnxreq_ifstate | 178 | typedef struct p80211msg_lnxreq_ifstate |
179 | { | 179 | { |
@@ -182,7 +182,7 @@ typedef struct p80211msg_lnxreq_ifstate | |||
182 | u8 devname[WLAN_DEVNAMELEN_MAX] ; | 182 | u8 devname[WLAN_DEVNAMELEN_MAX] ; |
183 | p80211item_uint32_t ifstate ; | 183 | p80211item_uint32_t ifstate ; |
184 | p80211item_uint32_t resultcode ; | 184 | p80211item_uint32_t resultcode ; |
185 | } __WLAN_ATTRIB_PACK__ p80211msg_lnxreq_ifstate_t; | 185 | } __attribute__((packed)) p80211msg_lnxreq_ifstate_t; |
186 | 186 | ||
187 | typedef struct p80211msg_lnxreq_wlansniff | 187 | typedef struct p80211msg_lnxreq_wlansniff |
188 | { | 188 | { |
@@ -197,7 +197,7 @@ typedef struct p80211msg_lnxreq_wlansniff | |||
197 | p80211item_uint32_t stripfcs ; | 197 | p80211item_uint32_t stripfcs ; |
198 | p80211item_uint32_t packet_trunc ; | 198 | p80211item_uint32_t packet_trunc ; |
199 | p80211item_uint32_t resultcode ; | 199 | p80211item_uint32_t resultcode ; |
200 | } __WLAN_ATTRIB_PACK__ p80211msg_lnxreq_wlansniff_t; | 200 | } __attribute__((packed)) p80211msg_lnxreq_wlansniff_t; |
201 | 201 | ||
202 | typedef struct p80211msg_lnxreq_hostwep | 202 | typedef struct p80211msg_lnxreq_hostwep |
203 | { | 203 | { |
@@ -207,7 +207,7 @@ typedef struct p80211msg_lnxreq_hostwep | |||
207 | p80211item_uint32_t resultcode ; | 207 | p80211item_uint32_t resultcode ; |
208 | p80211item_uint32_t decrypt ; | 208 | p80211item_uint32_t decrypt ; |
209 | p80211item_uint32_t encrypt ; | 209 | p80211item_uint32_t encrypt ; |
210 | } __WLAN_ATTRIB_PACK__ p80211msg_lnxreq_hostwep_t; | 210 | } __attribute__((packed)) p80211msg_lnxreq_hostwep_t; |
211 | 211 | ||
212 | typedef struct p80211msg_lnxreq_commsquality | 212 | typedef struct p80211msg_lnxreq_commsquality |
213 | { | 213 | { |
@@ -219,7 +219,7 @@ typedef struct p80211msg_lnxreq_commsquality | |||
219 | p80211item_uint32_t link ; | 219 | p80211item_uint32_t link ; |
220 | p80211item_uint32_t level ; | 220 | p80211item_uint32_t level ; |
221 | p80211item_uint32_t noise ; | 221 | p80211item_uint32_t noise ; |
222 | } __WLAN_ATTRIB_PACK__ p80211msg_lnxreq_commsquality_t; | 222 | } __attribute__((packed)) p80211msg_lnxreq_commsquality_t; |
223 | 223 | ||
224 | typedef struct p80211msg_lnxreq_autojoin | 224 | typedef struct p80211msg_lnxreq_autojoin |
225 | { | 225 | { |
@@ -230,7 +230,7 @@ typedef struct p80211msg_lnxreq_autojoin | |||
230 | u8 pad_19D[3] ; | 230 | u8 pad_19D[3] ; |
231 | p80211item_uint32_t authtype ; | 231 | p80211item_uint32_t authtype ; |
232 | p80211item_uint32_t resultcode ; | 232 | p80211item_uint32_t resultcode ; |
233 | } __WLAN_ATTRIB_PACK__ p80211msg_lnxreq_autojoin_t; | 233 | } __attribute__((packed)) p80211msg_lnxreq_autojoin_t; |
234 | 234 | ||
235 | typedef struct p80211msg_p2req_readpda | 235 | typedef struct p80211msg_p2req_readpda |
236 | { | 236 | { |
@@ -239,7 +239,7 @@ typedef struct p80211msg_p2req_readpda | |||
239 | u8 devname[WLAN_DEVNAMELEN_MAX] ; | 239 | u8 devname[WLAN_DEVNAMELEN_MAX] ; |
240 | p80211item_unk1024_t pda ; | 240 | p80211item_unk1024_t pda ; |
241 | p80211item_uint32_t resultcode ; | 241 | p80211item_uint32_t resultcode ; |
242 | } __WLAN_ATTRIB_PACK__ p80211msg_p2req_readpda_t; | 242 | } __attribute__((packed)) p80211msg_p2req_readpda_t; |
243 | 243 | ||
244 | typedef struct p80211msg_p2req_ramdl_state | 244 | typedef struct p80211msg_p2req_ramdl_state |
245 | { | 245 | { |
@@ -249,7 +249,7 @@ typedef struct p80211msg_p2req_ramdl_state | |||
249 | p80211item_uint32_t enable ; | 249 | p80211item_uint32_t enable ; |
250 | p80211item_uint32_t exeaddr ; | 250 | p80211item_uint32_t exeaddr ; |
251 | p80211item_uint32_t resultcode ; | 251 | p80211item_uint32_t resultcode ; |
252 | } __WLAN_ATTRIB_PACK__ p80211msg_p2req_ramdl_state_t; | 252 | } __attribute__((packed)) p80211msg_p2req_ramdl_state_t; |
253 | 253 | ||
254 | typedef struct p80211msg_p2req_ramdl_write | 254 | typedef struct p80211msg_p2req_ramdl_write |
255 | { | 255 | { |
@@ -260,7 +260,7 @@ typedef struct p80211msg_p2req_ramdl_write | |||
260 | p80211item_uint32_t len ; | 260 | p80211item_uint32_t len ; |
261 | p80211item_unk4096_t data ; | 261 | p80211item_unk4096_t data ; |
262 | p80211item_uint32_t resultcode ; | 262 | p80211item_uint32_t resultcode ; |
263 | } __WLAN_ATTRIB_PACK__ p80211msg_p2req_ramdl_write_t; | 263 | } __attribute__((packed)) p80211msg_p2req_ramdl_write_t; |
264 | 264 | ||
265 | typedef struct p80211msg_p2req_flashdl_state | 265 | typedef struct p80211msg_p2req_flashdl_state |
266 | { | 266 | { |
@@ -269,7 +269,7 @@ typedef struct p80211msg_p2req_flashdl_state | |||
269 | u8 devname[WLAN_DEVNAMELEN_MAX] ; | 269 | u8 devname[WLAN_DEVNAMELEN_MAX] ; |
270 | p80211item_uint32_t enable ; | 270 | p80211item_uint32_t enable ; |
271 | p80211item_uint32_t resultcode ; | 271 | p80211item_uint32_t resultcode ; |
272 | } __WLAN_ATTRIB_PACK__ p80211msg_p2req_flashdl_state_t; | 272 | } __attribute__((packed)) p80211msg_p2req_flashdl_state_t; |
273 | 273 | ||
274 | typedef struct p80211msg_p2req_flashdl_write | 274 | typedef struct p80211msg_p2req_flashdl_write |
275 | { | 275 | { |
@@ -280,6 +280,6 @@ typedef struct p80211msg_p2req_flashdl_write | |||
280 | p80211item_uint32_t len ; | 280 | p80211item_uint32_t len ; |
281 | p80211item_unk4096_t data ; | 281 | p80211item_unk4096_t data ; |
282 | p80211item_uint32_t resultcode ; | 282 | p80211item_uint32_t resultcode ; |
283 | } __WLAN_ATTRIB_PACK__ p80211msg_p2req_flashdl_write_t; | 283 | } __attribute__((packed)) p80211msg_p2req_flashdl_write_t; |
284 | 284 | ||
285 | #endif | 285 | #endif |
diff --git a/drivers/staging/wlan-ng/p80211mgmt.h b/drivers/staging/wlan-ng/p80211mgmt.h index 6cc16c3f8b1..ae46e8c4295 100644 --- a/drivers/staging/wlan-ng/p80211mgmt.h +++ b/drivers/staging/wlan-ng/p80211mgmt.h | |||
@@ -247,7 +247,7 @@ typedef struct wlan_ie | |||
247 | { | 247 | { |
248 | u8 eid; | 248 | u8 eid; |
249 | u8 len; | 249 | u8 len; |
250 | } __WLAN_ATTRIB_PACK__ wlan_ie_t; | 250 | } __attribute__((packed)) wlan_ie_t; |
251 | 251 | ||
252 | /*-- Service Set Identity (SSID) -----------------*/ | 252 | /*-- Service Set Identity (SSID) -----------------*/ |
253 | typedef struct wlan_ie_ssid | 253 | typedef struct wlan_ie_ssid |
@@ -255,7 +255,7 @@ typedef struct wlan_ie_ssid | |||
255 | u8 eid; | 255 | u8 eid; |
256 | u8 len; | 256 | u8 len; |
257 | u8 ssid[1]; /* may be zero, ptrs may overlap */ | 257 | u8 ssid[1]; /* may be zero, ptrs may overlap */ |
258 | } __WLAN_ATTRIB_PACK__ wlan_ie_ssid_t; | 258 | } __attribute__((packed)) wlan_ie_ssid_t; |
259 | 259 | ||
260 | /*-- Supported Rates -----------------------------*/ | 260 | /*-- Supported Rates -----------------------------*/ |
261 | typedef struct wlan_ie_supp_rates | 261 | typedef struct wlan_ie_supp_rates |
@@ -263,7 +263,7 @@ typedef struct wlan_ie_supp_rates | |||
263 | u8 eid; | 263 | u8 eid; |
264 | u8 len; | 264 | u8 len; |
265 | u8 rates[1]; /* had better be at LEAST one! */ | 265 | u8 rates[1]; /* had better be at LEAST one! */ |
266 | } __WLAN_ATTRIB_PACK__ wlan_ie_supp_rates_t; | 266 | } __attribute__((packed)) wlan_ie_supp_rates_t; |
267 | 267 | ||
268 | /*-- FH Parameter Set ----------------------------*/ | 268 | /*-- FH Parameter Set ----------------------------*/ |
269 | typedef struct wlan_ie_fh_parms | 269 | typedef struct wlan_ie_fh_parms |
@@ -274,7 +274,7 @@ typedef struct wlan_ie_fh_parms | |||
274 | u8 hopset; | 274 | u8 hopset; |
275 | u8 hoppattern; | 275 | u8 hoppattern; |
276 | u8 hopindex; | 276 | u8 hopindex; |
277 | } __WLAN_ATTRIB_PACK__ wlan_ie_fh_parms_t; | 277 | } __attribute__((packed)) wlan_ie_fh_parms_t; |
278 | 278 | ||
279 | /*-- DS Parameter Set ----------------------------*/ | 279 | /*-- DS Parameter Set ----------------------------*/ |
280 | typedef struct wlan_ie_ds_parms | 280 | typedef struct wlan_ie_ds_parms |
@@ -282,7 +282,7 @@ typedef struct wlan_ie_ds_parms | |||
282 | u8 eid; | 282 | u8 eid; |
283 | u8 len; | 283 | u8 len; |
284 | u8 curr_ch; | 284 | u8 curr_ch; |
285 | } __WLAN_ATTRIB_PACK__ wlan_ie_ds_parms_t; | 285 | } __attribute__((packed)) wlan_ie_ds_parms_t; |
286 | 286 | ||
287 | /*-- CF Parameter Set ----------------------------*/ | 287 | /*-- CF Parameter Set ----------------------------*/ |
288 | 288 | ||
@@ -294,7 +294,7 @@ typedef struct wlan_ie_cf_parms | |||
294 | u8 cfp_period; | 294 | u8 cfp_period; |
295 | u16 cfp_maxdur; | 295 | u16 cfp_maxdur; |
296 | u16 cfp_durremaining; | 296 | u16 cfp_durremaining; |
297 | } __WLAN_ATTRIB_PACK__ wlan_ie_cf_parms_t; | 297 | } __attribute__((packed)) wlan_ie_cf_parms_t; |
298 | 298 | ||
299 | /*-- TIM ------------------------------------------*/ | 299 | /*-- TIM ------------------------------------------*/ |
300 | typedef struct wlan_ie_tim | 300 | typedef struct wlan_ie_tim |
@@ -305,7 +305,7 @@ typedef struct wlan_ie_tim | |||
305 | u8 dtim_period; | 305 | u8 dtim_period; |
306 | u8 bitmap_ctl; | 306 | u8 bitmap_ctl; |
307 | u8 virt_bm[1]; | 307 | u8 virt_bm[1]; |
308 | } __WLAN_ATTRIB_PACK__ wlan_ie_tim_t; | 308 | } __attribute__((packed)) wlan_ie_tim_t; |
309 | 309 | ||
310 | /*-- IBSS Parameter Set ---------------------------*/ | 310 | /*-- IBSS Parameter Set ---------------------------*/ |
311 | typedef struct wlan_ie_ibss_parms | 311 | typedef struct wlan_ie_ibss_parms |
@@ -313,7 +313,7 @@ typedef struct wlan_ie_ibss_parms | |||
313 | u8 eid; | 313 | u8 eid; |
314 | u8 len; | 314 | u8 len; |
315 | u16 atim_win; | 315 | u16 atim_win; |
316 | } __WLAN_ATTRIB_PACK__ wlan_ie_ibss_parms_t; | 316 | } __attribute__((packed)) wlan_ie_ibss_parms_t; |
317 | 317 | ||
318 | /*-- Challenge Text ------------------------------*/ | 318 | /*-- Challenge Text ------------------------------*/ |
319 | typedef struct wlan_ie_challenge | 319 | typedef struct wlan_ie_challenge |
@@ -321,7 +321,7 @@ typedef struct wlan_ie_challenge | |||
321 | u8 eid; | 321 | u8 eid; |
322 | u8 len; | 322 | u8 len; |
323 | u8 challenge[1]; | 323 | u8 challenge[1]; |
324 | } __WLAN_ATTRIB_PACK__ wlan_ie_challenge_t; | 324 | } __attribute__((packed)) wlan_ie_challenge_t; |
325 | 325 | ||
326 | /*-------------------------------------------------*/ | 326 | /*-------------------------------------------------*/ |
327 | /* Frame Types */ | 327 | /* Frame Types */ |
diff --git a/drivers/staging/wlan-ng/p80211msg.h b/drivers/staging/wlan-ng/p80211msg.h index 3a575d8cc99..0281ddca2bf 100644 --- a/drivers/staging/wlan-ng/p80211msg.h +++ b/drivers/staging/wlan-ng/p80211msg.h | |||
@@ -81,7 +81,7 @@ typedef struct p80211msg | |||
81 | u32 msgcode; | 81 | u32 msgcode; |
82 | u32 msglen; | 82 | u32 msglen; |
83 | u8 devname[WLAN_DEVNAMELEN_MAX]; | 83 | u8 devname[WLAN_DEVNAMELEN_MAX]; |
84 | } __WLAN_ATTRIB_PACK__ p80211msg_t; | 84 | } __attribute__((packed)) p80211msg_t; |
85 | 85 | ||
86 | typedef struct p80211msgd | 86 | typedef struct p80211msgd |
87 | { | 87 | { |
@@ -89,7 +89,7 @@ typedef struct p80211msgd | |||
89 | u32 msglen; | 89 | u32 msglen; |
90 | u8 devname[WLAN_DEVNAMELEN_MAX]; | 90 | u8 devname[WLAN_DEVNAMELEN_MAX]; |
91 | u8 args[0]; | 91 | u8 args[0]; |
92 | } __WLAN_ATTRIB_PACK__ p80211msgd_t; | 92 | } __attribute__((packed)) p80211msgd_t; |
93 | 93 | ||
94 | /*================================================================*/ | 94 | /*================================================================*/ |
95 | /* Extern Declarations */ | 95 | /* Extern Declarations */ |
diff --git a/drivers/staging/wlan-ng/p80211types.h b/drivers/staging/wlan-ng/p80211types.h index 5be6737e3e5..122e74b7a2d 100644 --- a/drivers/staging/wlan-ng/p80211types.h +++ b/drivers/staging/wlan-ng/p80211types.h | |||
@@ -395,48 +395,48 @@ typedef struct p80211enum | |||
395 | typedef struct p80211pstr | 395 | typedef struct p80211pstr |
396 | { | 396 | { |
397 | u8 len; | 397 | u8 len; |
398 | } __WLAN_ATTRIB_PACK__ p80211pstr_t; | 398 | } __attribute__((packed)) p80211pstr_t; |
399 | 399 | ||
400 | typedef struct p80211pstrd | 400 | typedef struct p80211pstrd |
401 | { | 401 | { |
402 | u8 len; | 402 | u8 len; |
403 | u8 data[0]; | 403 | u8 data[0]; |
404 | } __WLAN_ATTRIB_PACK__ p80211pstrd_t; | 404 | } __attribute__((packed)) p80211pstrd_t; |
405 | 405 | ||
406 | /* Maximum pascal string */ | 406 | /* Maximum pascal string */ |
407 | typedef struct p80211pstr255 | 407 | typedef struct p80211pstr255 |
408 | { | 408 | { |
409 | u8 len; | 409 | u8 len; |
410 | u8 data[MAXLEN_PSTR255]; | 410 | u8 data[MAXLEN_PSTR255]; |
411 | } __WLAN_ATTRIB_PACK__ p80211pstr255_t; | 411 | } __attribute__((packed)) p80211pstr255_t; |
412 | 412 | ||
413 | /* pascal string for macaddress and bssid */ | 413 | /* pascal string for macaddress and bssid */ |
414 | typedef struct p80211pstr6 | 414 | typedef struct p80211pstr6 |
415 | { | 415 | { |
416 | u8 len; | 416 | u8 len; |
417 | u8 data[MAXLEN_PSTR6]; | 417 | u8 data[MAXLEN_PSTR6]; |
418 | } __WLAN_ATTRIB_PACK__ p80211pstr6_t; | 418 | } __attribute__((packed)) p80211pstr6_t; |
419 | 419 | ||
420 | /* pascal string for channel list */ | 420 | /* pascal string for channel list */ |
421 | typedef struct p80211pstr14 | 421 | typedef struct p80211pstr14 |
422 | { | 422 | { |
423 | u8 len; | 423 | u8 len; |
424 | u8 data[MAXLEN_PSTR14]; | 424 | u8 data[MAXLEN_PSTR14]; |
425 | } __WLAN_ATTRIB_PACK__ p80211pstr14_t; | 425 | } __attribute__((packed)) p80211pstr14_t; |
426 | 426 | ||
427 | /* pascal string for ssid */ | 427 | /* pascal string for ssid */ |
428 | typedef struct p80211pstr32 | 428 | typedef struct p80211pstr32 |
429 | { | 429 | { |
430 | u8 len; | 430 | u8 len; |
431 | u8 data[MAXLEN_PSTR32]; | 431 | u8 data[MAXLEN_PSTR32]; |
432 | } __WLAN_ATTRIB_PACK__ p80211pstr32_t; | 432 | } __attribute__((packed)) p80211pstr32_t; |
433 | 433 | ||
434 | /* MAC address array */ | 434 | /* MAC address array */ |
435 | typedef struct p80211macarray | 435 | typedef struct p80211macarray |
436 | { | 436 | { |
437 | u32 cnt; | 437 | u32 cnt; |
438 | u8 data[1][MAXLEN_PSTR6]; | 438 | u8 data[1][MAXLEN_PSTR6]; |
439 | } __WLAN_ATTRIB_PACK__ p80211macarray_t; | 439 | } __attribute__((packed)) p80211macarray_t; |
440 | 440 | ||
441 | /* prototype template */ | 441 | /* prototype template */ |
442 | typedef struct p80211item | 442 | typedef struct p80211item |
@@ -444,7 +444,7 @@ typedef struct p80211item | |||
444 | u32 did; | 444 | u32 did; |
445 | u16 status; | 445 | u16 status; |
446 | u16 len; | 446 | u16 len; |
447 | } __WLAN_ATTRIB_PACK__ p80211item_t; | 447 | } __attribute__((packed)) p80211item_t; |
448 | 448 | ||
449 | /* prototype template w/ data item */ | 449 | /* prototype template w/ data item */ |
450 | typedef struct p80211itemd | 450 | typedef struct p80211itemd |
@@ -453,7 +453,7 @@ typedef struct p80211itemd | |||
453 | u16 status; | 453 | u16 status; |
454 | u16 len; | 454 | u16 len; |
455 | u8 data[0]; | 455 | u8 data[0]; |
456 | } __WLAN_ATTRIB_PACK__ p80211itemd_t; | 456 | } __attribute__((packed)) p80211itemd_t; |
457 | 457 | ||
458 | /* message data item for int, BOUNDEDINT, ENUMINT */ | 458 | /* message data item for int, BOUNDEDINT, ENUMINT */ |
459 | typedef struct p80211item_uint32 | 459 | typedef struct p80211item_uint32 |
@@ -462,7 +462,7 @@ typedef struct p80211item_uint32 | |||
462 | u16 status; | 462 | u16 status; |
463 | u16 len; | 463 | u16 len; |
464 | u32 data; | 464 | u32 data; |
465 | } __WLAN_ATTRIB_PACK__ p80211item_uint32_t; | 465 | } __attribute__((packed)) p80211item_uint32_t; |
466 | 466 | ||
467 | /* message data item for OCTETSTR, DISPLAYSTR */ | 467 | /* message data item for OCTETSTR, DISPLAYSTR */ |
468 | typedef struct p80211item_pstr6 | 468 | typedef struct p80211item_pstr6 |
@@ -471,7 +471,7 @@ typedef struct p80211item_pstr6 | |||
471 | u16 status; | 471 | u16 status; |
472 | u16 len; | 472 | u16 len; |
473 | p80211pstr6_t data; | 473 | p80211pstr6_t data; |
474 | } __WLAN_ATTRIB_PACK__ p80211item_pstr6_t; | 474 | } __attribute__((packed)) p80211item_pstr6_t; |
475 | 475 | ||
476 | /* message data item for OCTETSTR, DISPLAYSTR */ | 476 | /* message data item for OCTETSTR, DISPLAYSTR */ |
477 | typedef struct p80211item_pstr14 | 477 | typedef struct p80211item_pstr14 |
@@ -480,7 +480,7 @@ typedef struct p80211item_pstr14 | |||
480 | u16 status; | 480 | u16 status; |
481 | u16 len; | 481 | u16 len; |
482 | p80211pstr14_t data; | 482 | p80211pstr14_t data; |
483 | } __WLAN_ATTRIB_PACK__ p80211item_pstr14_t; | 483 | } __attribute__((packed)) p80211item_pstr14_t; |
484 | 484 | ||
485 | /* message data item for OCTETSTR, DISPLAYSTR */ | 485 | /* message data item for OCTETSTR, DISPLAYSTR */ |
486 | typedef struct p80211item_pstr32 | 486 | typedef struct p80211item_pstr32 |
@@ -489,7 +489,7 @@ typedef struct p80211item_pstr32 | |||
489 | u16 status; | 489 | u16 status; |
490 | u16 len; | 490 | u16 len; |
491 | p80211pstr32_t data; | 491 | p80211pstr32_t data; |
492 | } __WLAN_ATTRIB_PACK__ p80211item_pstr32_t; | 492 | } __attribute__((packed)) p80211item_pstr32_t; |
493 | 493 | ||
494 | /* message data item for OCTETSTR, DISPLAYSTR */ | 494 | /* message data item for OCTETSTR, DISPLAYSTR */ |
495 | typedef struct p80211item_pstr255 | 495 | typedef struct p80211item_pstr255 |
@@ -498,7 +498,7 @@ typedef struct p80211item_pstr255 | |||
498 | u16 status; | 498 | u16 status; |
499 | u16 len; | 499 | u16 len; |
500 | p80211pstr255_t data; | 500 | p80211pstr255_t data; |
501 | } __WLAN_ATTRIB_PACK__ p80211item_pstr255_t; | 501 | } __attribute__((packed)) p80211item_pstr255_t; |
502 | 502 | ||
503 | /* message data item for UNK 392, namely mib items */ | 503 | /* message data item for UNK 392, namely mib items */ |
504 | typedef struct p80211item_unk392 | 504 | typedef struct p80211item_unk392 |
@@ -507,7 +507,7 @@ typedef struct p80211item_unk392 | |||
507 | u16 status; | 507 | u16 status; |
508 | u16 len; | 508 | u16 len; |
509 | u8 data[MAXLEN_MIBATTRIBUTE]; | 509 | u8 data[MAXLEN_MIBATTRIBUTE]; |
510 | } __WLAN_ATTRIB_PACK__ p80211item_unk392_t; | 510 | } __attribute__((packed)) p80211item_unk392_t; |
511 | 511 | ||
512 | /* message data item for UNK 1025, namely p2 pdas */ | 512 | /* message data item for UNK 1025, namely p2 pdas */ |
513 | typedef struct p80211item_unk1024 | 513 | typedef struct p80211item_unk1024 |
@@ -516,7 +516,7 @@ typedef struct p80211item_unk1024 | |||
516 | u16 status; | 516 | u16 status; |
517 | u16 len; | 517 | u16 len; |
518 | u8 data[1024]; | 518 | u8 data[1024]; |
519 | } __WLAN_ATTRIB_PACK__ p80211item_unk1024_t; | 519 | } __attribute__((packed)) p80211item_unk1024_t; |
520 | 520 | ||
521 | /* message data item for UNK 4096, namely p2 download chunks */ | 521 | /* message data item for UNK 4096, namely p2 download chunks */ |
522 | typedef struct p80211item_unk4096 | 522 | typedef struct p80211item_unk4096 |
@@ -525,7 +525,7 @@ typedef struct p80211item_unk4096 | |||
525 | u16 status; | 525 | u16 status; |
526 | u16 len; | 526 | u16 len; |
527 | u8 data[4096]; | 527 | u8 data[4096]; |
528 | } __WLAN_ATTRIB_PACK__ p80211item_unk4096_t; | 528 | } __attribute__((packed)) p80211item_unk4096_t; |
529 | 529 | ||
530 | struct catlistitem; | 530 | struct catlistitem; |
531 | 531 | ||
diff --git a/drivers/staging/wlan-ng/wlan_compat.h b/drivers/staging/wlan-ng/wlan_compat.h index 8b8a510685c..0fa1c6a8be1 100644 --- a/drivers/staging/wlan-ng/wlan_compat.h +++ b/drivers/staging/wlan-ng/wlan_compat.h | |||
@@ -86,11 +86,6 @@ | |||
86 | #define BIT31 0x80000000 | 86 | #define BIT31 0x80000000 |
87 | 87 | ||
88 | /*=============================================================*/ | 88 | /*=============================================================*/ |
89 | /*------ Compiler Portability Macros --------------------------*/ | ||
90 | /*=============================================================*/ | ||
91 | #define __WLAN_ATTRIB_PACK__ __attribute__ ((packed)) | ||
92 | |||
93 | /*=============================================================*/ | ||
94 | /*------ OS Portability Macros --------------------------------*/ | 89 | /*------ OS Portability Macros --------------------------------*/ |
95 | /*=============================================================*/ | 90 | /*=============================================================*/ |
96 | 91 | ||