diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-06-02 14:10:09 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-06-03 06:18:23 -0400 |
commit | ba2d3587912f82d1ab4367975b1df460db60fb1e (patch) | |
tree | 1e4e04caf23274bb4e39edbfc5713b4856326953 /drivers/net/wireless/wl12xx/wl12xx_80211.h | |
parent | 1273d97674a1782ff55b823aa6c40aea9b538aaf (diff) |
drivers/net: use __packed annotation
cleanup patch.
Use new __packed annotation in drivers/net/
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl12xx_80211.h')
-rw-r--r-- | drivers/net/wireless/wl12xx/wl12xx_80211.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/net/wireless/wl12xx/wl12xx_80211.h b/drivers/net/wireless/wl12xx/wl12xx_80211.h index 055d7bc6f592..184628027213 100644 --- a/drivers/net/wireless/wl12xx/wl12xx_80211.h +++ b/drivers/net/wireless/wl12xx/wl12xx_80211.h | |||
@@ -66,41 +66,41 @@ struct ieee80211_header { | |||
66 | u8 bssid[ETH_ALEN]; | 66 | u8 bssid[ETH_ALEN]; |
67 | __le16 seq_ctl; | 67 | __le16 seq_ctl; |
68 | u8 payload[0]; | 68 | u8 payload[0]; |
69 | } __attribute__ ((packed)); | 69 | } __packed; |
70 | 70 | ||
71 | struct wl12xx_ie_header { | 71 | struct wl12xx_ie_header { |
72 | u8 id; | 72 | u8 id; |
73 | u8 len; | 73 | u8 len; |
74 | } __attribute__ ((packed)); | 74 | } __packed; |
75 | 75 | ||
76 | /* IEs */ | 76 | /* IEs */ |
77 | 77 | ||
78 | struct wl12xx_ie_ssid { | 78 | struct wl12xx_ie_ssid { |
79 | struct wl12xx_ie_header header; | 79 | struct wl12xx_ie_header header; |
80 | char ssid[IW_ESSID_MAX_SIZE]; | 80 | char ssid[IW_ESSID_MAX_SIZE]; |
81 | } __attribute__ ((packed)); | 81 | } __packed; |
82 | 82 | ||
83 | struct wl12xx_ie_rates { | 83 | struct wl12xx_ie_rates { |
84 | struct wl12xx_ie_header header; | 84 | struct wl12xx_ie_header header; |
85 | u8 rates[MAX_SUPPORTED_RATES]; | 85 | u8 rates[MAX_SUPPORTED_RATES]; |
86 | } __attribute__ ((packed)); | 86 | } __packed; |
87 | 87 | ||
88 | struct wl12xx_ie_ds_params { | 88 | struct wl12xx_ie_ds_params { |
89 | struct wl12xx_ie_header header; | 89 | struct wl12xx_ie_header header; |
90 | u8 channel; | 90 | u8 channel; |
91 | } __attribute__ ((packed)); | 91 | } __packed; |
92 | 92 | ||
93 | struct country_triplet { | 93 | struct country_triplet { |
94 | u8 channel; | 94 | u8 channel; |
95 | u8 num_channels; | 95 | u8 num_channels; |
96 | u8 max_tx_power; | 96 | u8 max_tx_power; |
97 | } __attribute__ ((packed)); | 97 | } __packed; |
98 | 98 | ||
99 | struct wl12xx_ie_country { | 99 | struct wl12xx_ie_country { |
100 | struct wl12xx_ie_header header; | 100 | struct wl12xx_ie_header header; |
101 | u8 country_string[COUNTRY_STRING_LEN]; | 101 | u8 country_string[COUNTRY_STRING_LEN]; |
102 | struct country_triplet triplets[MAX_COUNTRY_TRIPLETS]; | 102 | struct country_triplet triplets[MAX_COUNTRY_TRIPLETS]; |
103 | } __attribute__ ((packed)); | 103 | } __packed; |
104 | 104 | ||
105 | 105 | ||
106 | /* Templates */ | 106 | /* Templates */ |
@@ -115,30 +115,30 @@ struct wl12xx_beacon_template { | |||
115 | struct wl12xx_ie_rates ext_rates; | 115 | struct wl12xx_ie_rates ext_rates; |
116 | struct wl12xx_ie_ds_params ds_params; | 116 | struct wl12xx_ie_ds_params ds_params; |
117 | struct wl12xx_ie_country country; | 117 | struct wl12xx_ie_country country; |
118 | } __attribute__ ((packed)); | 118 | } __packed; |
119 | 119 | ||
120 | struct wl12xx_null_data_template { | 120 | struct wl12xx_null_data_template { |
121 | struct ieee80211_header header; | 121 | struct ieee80211_header header; |
122 | } __attribute__ ((packed)); | 122 | } __packed; |
123 | 123 | ||
124 | struct wl12xx_ps_poll_template { | 124 | struct wl12xx_ps_poll_template { |
125 | __le16 fc; | 125 | __le16 fc; |
126 | __le16 aid; | 126 | __le16 aid; |
127 | u8 bssid[ETH_ALEN]; | 127 | u8 bssid[ETH_ALEN]; |
128 | u8 ta[ETH_ALEN]; | 128 | u8 ta[ETH_ALEN]; |
129 | } __attribute__ ((packed)); | 129 | } __packed; |
130 | 130 | ||
131 | struct wl12xx_qos_null_data_template { | 131 | struct wl12xx_qos_null_data_template { |
132 | struct ieee80211_header header; | 132 | struct ieee80211_header header; |
133 | __le16 qos_ctl; | 133 | __le16 qos_ctl; |
134 | } __attribute__ ((packed)); | 134 | } __packed; |
135 | 135 | ||
136 | struct wl12xx_probe_req_template { | 136 | struct wl12xx_probe_req_template { |
137 | struct ieee80211_header header; | 137 | struct ieee80211_header header; |
138 | struct wl12xx_ie_ssid ssid; | 138 | struct wl12xx_ie_ssid ssid; |
139 | struct wl12xx_ie_rates rates; | 139 | struct wl12xx_ie_rates rates; |
140 | struct wl12xx_ie_rates ext_rates; | 140 | struct wl12xx_ie_rates ext_rates; |
141 | } __attribute__ ((packed)); | 141 | } __packed; |
142 | 142 | ||
143 | 143 | ||
144 | struct wl12xx_probe_resp_template { | 144 | struct wl12xx_probe_resp_template { |
@@ -151,6 +151,6 @@ struct wl12xx_probe_resp_template { | |||
151 | struct wl12xx_ie_rates ext_rates; | 151 | struct wl12xx_ie_rates ext_rates; |
152 | struct wl12xx_ie_ds_params ds_params; | 152 | struct wl12xx_ie_ds_params ds_params; |
153 | struct wl12xx_ie_country country; | 153 | struct wl12xx_ie_country country; |
154 | } __attribute__ ((packed)); | 154 | } __packed; |
155 | 155 | ||
156 | #endif | 156 | #endif |