drivers/net: use __packed annotation

[pandora-wifi.git] / drivers / net / wireless / wl12xx / wl12xx_80211.h

diff --git a/drivers/net/wireless/wl12xx/wl12xx_80211.h b/drivers/net/wireless/wl12xx/wl12xx_80211.h
index 055d7bc..1846280 100644 (file)
--- a/drivers/net/wireless/wl12xx/wl12xx_80211.h
+++ b/drivers/net/wireless/wl12xx/wl12xx_80211.h
@@ -66,41 +66,41 @@ struct ieee80211_header {
        u8 bssid[ETH_ALEN];
        __le16 seq_ctl;
        u8 payload[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct wl12xx_ie_header {
        u8 id;
        u8 len;
-} __attribute__ ((packed));
+} __packed;
 
 /* IEs */
 
 struct wl12xx_ie_ssid {
        struct wl12xx_ie_header header;
        char ssid[IW_ESSID_MAX_SIZE];
-} __attribute__ ((packed));
+} __packed;
 
 struct wl12xx_ie_rates {
        struct wl12xx_ie_header header;
        u8 rates[MAX_SUPPORTED_RATES];
-} __attribute__ ((packed));
+} __packed;
 
 struct wl12xx_ie_ds_params {
        struct wl12xx_ie_header header;
        u8 channel;
-} __attribute__ ((packed));
+} __packed;
 
 struct country_triplet {
        u8 channel;
        u8 num_channels;
        u8 max_tx_power;
-} __attribute__ ((packed));
+} __packed;
 
 struct wl12xx_ie_country {
        struct wl12xx_ie_header header;
        u8 country_string[COUNTRY_STRING_LEN];
        struct country_triplet triplets[MAX_COUNTRY_TRIPLETS];
-} __attribute__ ((packed));
+} __packed;
 
 
 /* Templates */
@@ -115,30 +115,30 @@ struct wl12xx_beacon_template {
        struct wl12xx_ie_rates ext_rates;
        struct wl12xx_ie_ds_params ds_params;
        struct wl12xx_ie_country country;
-} __attribute__ ((packed));
+} __packed;
 
 struct wl12xx_null_data_template {
        struct ieee80211_header header;
-} __attribute__ ((packed));
+} __packed;
 
 struct wl12xx_ps_poll_template {
        __le16 fc;
        __le16 aid;
        u8 bssid[ETH_ALEN];
        u8 ta[ETH_ALEN];
-} __attribute__ ((packed));
+} __packed;
 
 struct wl12xx_qos_null_data_template {
        struct ieee80211_header header;
        __le16 qos_ctl;
-} __attribute__ ((packed));
+} __packed;
 
 struct wl12xx_probe_req_template {
        struct ieee80211_header header;
        struct wl12xx_ie_ssid ssid;
        struct wl12xx_ie_rates rates;
        struct wl12xx_ie_rates ext_rates;
-} __attribute__ ((packed));
+} __packed;
 
 
 struct wl12xx_probe_resp_template {
@@ -151,6 +151,6 @@ struct wl12xx_probe_resp_template {
        struct wl12xx_ie_rates ext_rates;
        struct wl12xx_ie_ds_params ds_params;
        struct wl12xx_ie_country country;
-} __attribute__ ((packed));
+} __packed;
 
 #endif