Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-commands.h

4 files changed, 99 insertions, 99 deletions

diff --git a/drivers/net/wireless/libertas/host.h b/drivers/net/wireless/libertas/host.h
index d70355cff908..43d020cd7403 100644
--- a/drivers/net/wireless/libertas/host.h
+++ b/drivers/net/wireless/libertas/host.h
@@ -326,7 +326,7 @@ struct txpd {
         u8 pktdelay_2ms;
         /* reserved */
         u8 reserved1;
-} __attribute__ ((packed));
+} __packed;
 
 /* RxPD Descriptor */
 struct rxpd {
@@ -339,8 +339,8 @@ struct rxpd {
                         u8 bss_type;
                         /* BSS number */
                         u8 bss_num;
-                } __attribute__ ((packed)) bss;
-        } __attribute__ ((packed)) u;
+                } __packed bss;
+        } __packed u;
 
         /* SNR */
         u8 snr;
@@ -366,14 +366,14 @@ struct rxpd {
         /* Pkt Priority */
         u8 priority;
         u8 reserved[3];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_header {
         __le16 command;
         __le16 size;
         __le16 seqnum;
         __le16 result;
-} __attribute__ ((packed));
+} __packed;
 
 /* Generic structure to hold all key types. */
 struct enc_key {
@@ -387,7 +387,7 @@ struct enc_key {
 struct lbs_offset_value {
         u32 offset;
         u32 value;
-} __attribute__ ((packed));
+} __packed;
 
 #define MRVDRV_MAX_TRIPLET_802_11D              83
 
@@ -450,7 +450,7 @@ struct cmd_ds_get_hw_spec {
 
         /*FW/HW capability */
         __le32 fwcapinfo;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_subscribe_event {
         struct cmd_header hdr;
@@ -464,7 +464,7 @@ struct cmd_ds_802_11_subscribe_event {
          * bump this up a bit.
          */
         uint8_t tlv[128];
-} __attribute__ ((packed));
+} __packed;
 
 /*
  * This scan handle Country Information IE(802.11d compliant)
@@ -476,7 +476,7 @@ struct cmd_ds_802_11_scan {
         uint8_t bsstype;
         uint8_t bssid[ETH_ALEN];
         uint8_t tlvbuffer[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_scan_rsp {
         struct cmd_header hdr;
@@ -484,7 +484,7 @@ struct cmd_ds_802_11_scan_rsp {
         __le16 bssdescriptsize;
         uint8_t nr_sets;
         uint8_t bssdesc_and_tlvbuffer[0];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_get_log {
         struct cmd_header hdr;
@@ -502,20 +502,20 @@ struct cmd_ds_802_11_get_log {
         __le32 fcserror;
         __le32 txframe;
         __le32 wepundecryptable;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_mac_control {
         struct cmd_header hdr;
         __le16 action;
         u16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_mac_multicast_adr {
         struct cmd_header hdr;
         __le16 action;
         __le16 nr_of_adrs;
         u8 maclist[ETH_ALEN * MRVDRV_MAX_MULTICAST_LIST_SIZE];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_authenticate {
         struct cmd_header hdr;
@@ -523,14 +523,14 @@ struct cmd_ds_802_11_authenticate {
         u8 bssid[ETH_ALEN];
         u8 authtype;
         u8 reserved[10];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_deauthenticate {
         struct cmd_header hdr;
 
         u8 macaddr[ETH_ALEN];
         __le16 reasoncode;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_associate {
         struct cmd_header hdr;
@@ -541,7 +541,7 @@ struct cmd_ds_802_11_associate {
         __le16 bcnperiod;
         u8 dtimperiod;
         u8 iebuf[512];    /* Enough for required and most optional IEs */
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_associate_response {
         struct cmd_header hdr;
@@ -550,7 +550,7 @@ struct cmd_ds_802_11_associate_response {
         __le16 statuscode;
         __le16 aid;
         u8 iebuf[512];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_set_wep {
         struct cmd_header hdr;
@@ -564,7 +564,7 @@ struct cmd_ds_802_11_set_wep {
         /* 40, 128bit or TXWEP */
         uint8_t keytype[4];
         uint8_t keymaterial[4][16];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_snmp_mib {
         struct cmd_header hdr;
@@ -573,40 +573,40 @@ struct cmd_ds_802_11_snmp_mib {
         __le16 oid;
         __le16 bufsize;
         u8 value[128];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_mac_reg_access {
         __le16 action;
         __le16 offset;
         __le32 value;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_bbp_reg_access {
         __le16 action;
         __le16 offset;
         u8 value;
         u8 reserved[3];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_rf_reg_access {
         __le16 action;
         __le16 offset;
         u8 value;
         u8 reserved[3];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_radio_control {
         struct cmd_header hdr;
 
         __le16 action;
         __le16 control;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_beacon_control {
         __le16 action;
         __le16 beacon_enable;
         __le16 beacon_period;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_sleep_params {
         struct cmd_header hdr;
@@ -631,7 +631,7 @@ struct cmd_ds_802_11_sleep_params {
 
         /* reserved field, should be set to zero */
         __le16 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_rf_channel {
         struct cmd_header hdr;
@@ -641,7 +641,7 @@ struct cmd_ds_802_11_rf_channel {
         __le16 rftype;      /* unused */
         __le16 reserved;    /* unused */
         u8 channellist[32]; /* unused */
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_rssi {
         /* weighting factor */
@@ -650,21 +650,21 @@ struct cmd_ds_802_11_rssi {
         __le16 reserved_0;
         __le16 reserved_1;
         __le16 reserved_2;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_rssi_rsp {
         __le16 SNR;
         __le16 noisefloor;
         __le16 avgSNR;
         __le16 avgnoisefloor;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_mac_address {
         struct cmd_header hdr;
 
         __le16 action;
         u8 macadd[ETH_ALEN];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_rf_tx_power {
         struct cmd_header hdr;
@@ -673,26 +673,26 @@ struct cmd_ds_802_11_rf_tx_power {
         __le16 curlevel;
         s8 maxlevel;
         s8 minlevel;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_monitor_mode {
         __le16 action;
         __le16 mode;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_set_boot2_ver {
         struct cmd_header hdr;
 
         __le16 action;
         __le16 version;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_fw_wake_method {
         struct cmd_header hdr;
 
         __le16 action;
         __le16 method;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_ps_mode {
         __le16 action;
@@ -700,7 +700,7 @@ struct cmd_ds_802_11_ps_mode {
         __le16 multipledtim;
         __le16 reserved;
         __le16 locallisteninterval;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_confirm_sleep {
         struct cmd_header hdr;
@@ -710,7 +710,7 @@ struct cmd_confirm_sleep {
         __le16 multipledtim;
         __le16 reserved;
         __le16 locallisteninterval;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_data_rate {
         struct cmd_header hdr;
@@ -718,14 +718,14 @@ struct cmd_ds_802_11_data_rate {
         __le16 action;
         __le16 reserved;
         u8 rates[MAX_RATES];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_rate_adapt_rateset {
         struct cmd_header hdr;
         __le16 action;
         __le16 enablehwauto;
         __le16 bitmap;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_ad_hoc_start {
         struct cmd_header hdr;
@@ -742,14 +742,14 @@ struct cmd_ds_802_11_ad_hoc_start {
         __le16 capability;
         u8 rates[MAX_RATES];
         u8 tlv_memory_size_pad[100];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_ad_hoc_result {
         struct cmd_header hdr;
 
         u8 pad[3];
         u8 bssid[ETH_ALEN];
-} __attribute__ ((packed));
+} __packed;
 
 struct adhoc_bssdesc {
         u8 bssid[ETH_ALEN];
@@ -770,7 +770,7 @@ struct adhoc_bssdesc {
          * Adhoc join command and will cause a binary layout mismatch with
          * the firmware
          */
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_ad_hoc_join {
         struct cmd_header hdr;
@@ -778,18 +778,18 @@ struct cmd_ds_802_11_ad_hoc_join {
         struct adhoc_bssdesc bss;
         __le16 failtimeout;   /* Reserved on v9 and later */
         __le16 probedelay;    /* Reserved on v9 and later */
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_ad_hoc_stop {
         struct cmd_header hdr;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_enable_rsn {
         struct cmd_header hdr;
 
         __le16 action;
         __le16 enable;
-} __attribute__ ((packed));
+} __packed;
 
 struct MrvlIEtype_keyParamSet {
         /* type ID */
@@ -809,7 +809,7 @@ struct MrvlIEtype_keyParamSet {
 
         /* key material of size keylen */
         u8 key[32];
-} __attribute__ ((packed));
+} __packed;
 
 #define MAX_WOL_RULES           16
 
@@ -821,7 +821,7 @@ struct host_wol_rule {
         __le16 reserve;
         __be32 sig_mask;
         __be32 signature;
-} __attribute__ ((packed));
+} __packed;
 
 struct wol_config {
         uint8_t action;
@@ -829,7 +829,7 @@ struct wol_config {
         uint8_t no_rules_in_cmd;
         uint8_t result;
         struct host_wol_rule rule[MAX_WOL_RULES];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_host_sleep {
         struct cmd_header hdr;
@@ -837,7 +837,7 @@ struct cmd_ds_host_sleep {
         uint8_t gpio;
         uint16_t gap;
         struct wol_config wol_conf;
-} __attribute__ ((packed));
+} __packed;
 
 
 
@@ -846,7 +846,7 @@ struct cmd_ds_802_11_key_material {
 
         __le16 action;
         struct MrvlIEtype_keyParamSet keyParamSet[2];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_eeprom_access {
         struct cmd_header hdr;
@@ -856,7 +856,7 @@ struct cmd_ds_802_11_eeprom_access {
         /* firmware says it returns a maximum of 20 bytes */
 #define LBS_EEPROM_READ_LEN 20
         u8 value[LBS_EEPROM_READ_LEN];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_tpc_cfg {
         struct cmd_header hdr;
@@ -867,7 +867,7 @@ struct cmd_ds_802_11_tpc_cfg {
         int8_t P1;
         int8_t P2;
         uint8_t usesnr;
-} __attribute__ ((packed));
+} __packed;
 
 
 struct cmd_ds_802_11_pa_cfg {
@@ -878,14 +878,14 @@ struct cmd_ds_802_11_pa_cfg {
         int8_t P0;
         int8_t P1;
         int8_t P2;
-} __attribute__ ((packed));
+} __packed;
 
 
 struct cmd_ds_802_11_led_ctrl {
         __le16 action;
         __le16 numled;
         u8 data[256];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_802_11_afc {
         __le16 afc_auto;
@@ -899,22 +899,22 @@ struct cmd_ds_802_11_afc {
                         __le16 carrier_offset; /* signed */
                 };
         };
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_tx_rate_query {
         __le16 txrate;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_get_tsf {
         __le64 tsfvalue;
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_bt_access {
         __le16 action;
         __le32 id;
         u8 addr1[ETH_ALEN];
         u8 addr2[ETH_ALEN];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_fwt_access {
         __le16 action;
@@ -934,7 +934,7 @@ struct cmd_ds_fwt_access {
         __le32 snr;
         __le32 references;
         u8 prec[ETH_ALEN];
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_mesh_config {
         struct cmd_header hdr;
@@ -944,14 +944,14 @@ struct cmd_ds_mesh_config {
         __le16 type;
         __le16 length;
         u8 data[128];   /* last position reserved */
-} __attribute__ ((packed));
+} __packed;
 
 struct cmd_ds_mesh_access {
         struct cmd_header hdr;
 
         __le16 action;
         __le32 data[32];        /* last position reserved */
-} __attribute__ ((packed));
+} __packed;
 
 /* Number of stats counters returned by the firmware */
 #define MESH_STATS_NUM 8
@@ -984,5 +984,5 @@ struct cmd_ds_command {
                 struct cmd_ds_fwt_access fwt;
                 struct cmd_ds_802_11_beacon_control bcn_ctrl;
         } params;
-} __attribute__ ((packed));
+} __packed;
 #endif
diff --git a/drivers/net/wireless/libertas/radiotap.h b/drivers/net/wireless/libertas/radiotap.h
index d16b26416e82..b3c8ea6d610e 100644
--- a/drivers/net/wireless/libertas/radiotap.h
+++ b/drivers/net/wireless/libertas/radiotap.h
@@ -6,7 +6,7 @@ struct tx_radiotap_hdr {
         u8 txpower;
         u8 rts_retries;
         u8 data_retries;
-} __attribute__ ((packed));
+} __packed;
 
 #define TX_RADIOTAP_PRESENT (                           \
         (1 << IEEE80211_RADIOTAP_RATE) |                \
@@ -34,7 +34,7 @@ struct rx_radiotap_hdr {
         u8 flags;
         u8 rate;
         u8 antsignal;
-} __attribute__ ((packed));
+} __packed;
 
 #define RX_RADIOTAP_PRESENT (                   \
         (1 << IEEE80211_RADIOTAP_FLAGS) |       \
diff --git a/drivers/net/wireless/libertas/rx.c b/drivers/net/wireless/libertas/rx.c
index 2163df01caed..a4d0bca9ef2c 100644
--- a/drivers/net/wireless/libertas/rx.c
+++ b/drivers/net/wireless/libertas/rx.c
@@ -16,7 +16,7 @@ struct eth803hdr {
         u8 dest_addr[6];
         u8 src_addr[6];
         u16 h803_len;
-} __attribute__ ((packed));
+} __packed;
 
 struct rfc1042hdr {
         u8 llc_dsap;
@@ -24,17 +24,17 @@ struct rfc1042hdr {
         u8 llc_ctrl;
         u8 snap_oui[3];
         u16 snap_type;
-} __attribute__ ((packed));
+} __packed;
 
 struct rxpackethdr {
         struct eth803hdr eth803_hdr;
         struct rfc1042hdr rfc1042_hdr;
-} __attribute__ ((packed));
+} __packed;
 
 struct rx80211packethdr {
         struct rxpd rx_pd;
         void *eth80211_hdr;
-} __attribute__ ((packed));
+} __packed;
 
 static int process_rxed_802_11_packet(struct lbs_private *priv,
         struct sk_buff *skb);
diff --git a/drivers/net/wireless/libertas/types.h b/drivers/net/wireless/libertas/types.h
index 3e72c86ceca8..462fbb4cb743 100644
--- a/drivers/net/wireless/libertas/types.h
+++ b/drivers/net/wireless/libertas/types.h
@@ -11,7 +11,7 @@
 struct ieee_ie_header {
         u8 id;
         u8 len;
-} __attribute__ ((packed));
+} __packed;
 
 struct ieee_ie_cf_param_set {
         struct ieee_ie_header header;
@@ -20,19 +20,19 @@ struct ieee_ie_cf_param_set {
         u8 cfpperiod;
         __le16 cfpmaxduration;
         __le16 cfpdurationremaining;
-} __attribute__ ((packed));
+} __packed;
 
 
 struct ieee_ie_ibss_param_set {
         struct ieee_ie_header header;
 
         __le16 atimwindow;
-} __attribute__ ((packed));
+} __packed;
 
 union ieee_ss_param_set {
         struct ieee_ie_cf_param_set cf;
         struct ieee_ie_ibss_param_set ibss;
-} __attribute__ ((packed));
+} __packed;
 
 struct ieee_ie_fh_param_set {
         struct ieee_ie_header header;
@@ -41,18 +41,18 @@ struct ieee_ie_fh_param_set {
         u8 hopset;
         u8 hoppattern;
         u8 hopindex;
-} __attribute__ ((packed));
+} __packed;
 
 struct ieee_ie_ds_param_set {
         struct ieee_ie_header header;
 
         u8 channel;
-} __attribute__ ((packed));
+} __packed;
 
 union ieee_phy_param_set {
         struct ieee_ie_fh_param_set fh;
         struct ieee_ie_ds_param_set ds;
-} __attribute__ ((packed));
+} __packed;
 
 /** TLV  type ID definition */
 #define PROPRIETARY_TLV_BASE_ID         0x0100
@@ -100,28 +100,28 @@ union ieee_phy_param_set {
 struct mrvl_ie_header {
         __le16 type;
         __le16 len;
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_ie_data {
         struct mrvl_ie_header header;
         u8 Data[1];
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_ie_rates_param_set {
         struct mrvl_ie_header header;
         u8 rates[1];
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_ie_ssid_param_set {
         struct mrvl_ie_header header;
         u8 ssid[1];
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_ie_wildcard_ssid_param_set {
         struct mrvl_ie_header header;
         u8 MaxSsidlength;
         u8 ssid[1];
-} __attribute__ ((packed));
+} __packed;
 
 struct chanscanmode {
 #ifdef __BIG_ENDIAN_BITFIELD
@@ -133,7 +133,7 @@ struct chanscanmode {
         u8 disablechanfilt:1;
         u8 reserved_2_7:6;
 #endif
-} __attribute__ ((packed));
+} __packed;
 
 struct chanscanparamset {
         u8 radiotype;
@@ -141,12 +141,12 @@ struct chanscanparamset {
         struct chanscanmode chanscanmode;
         __le16 minscantime;
         __le16 maxscantime;
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_ie_chanlist_param_set {
         struct mrvl_ie_header header;
         struct chanscanparamset chanscanparam[1];
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_ie_cf_param_set {
         struct mrvl_ie_header header;
@@ -154,86 +154,86 @@ struct mrvl_ie_cf_param_set {
         u8 cfpperiod;
         __le16 cfpmaxduration;
         __le16 cfpdurationremaining;
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_ie_ds_param_set {
         struct mrvl_ie_header header;
         u8 channel;
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_ie_rsn_param_set {
         struct mrvl_ie_header header;
         u8 rsnie[1];
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_ie_tsf_timestamp {
         struct mrvl_ie_header header;
         __le64 tsftable[1];
-} __attribute__ ((packed));
+} __packed;
 
 /* v9 and later firmware only */
 struct mrvl_ie_auth_type {
         struct mrvl_ie_header header;
         __le16 auth;
-} __attribute__ ((packed));
+} __packed;
 
 /**  Local Power capability */
 struct mrvl_ie_power_capability {
         struct mrvl_ie_header header;
         s8 minpower;
         s8 maxpower;
-} __attribute__ ((packed));
+} __packed;
 
 /* used in CMD_802_11_SUBSCRIBE_EVENT for SNR, RSSI and Failure */
 struct mrvl_ie_thresholds {
         struct mrvl_ie_header header;
         u8 value;
         u8 freq;
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_ie_beacons_missed {
         struct mrvl_ie_header header;
         u8 beaconmissed;
         u8 reserved;
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_ie_num_probes {
         struct mrvl_ie_header header;
         __le16 numprobes;
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_ie_bcast_probe {
         struct mrvl_ie_header header;
         __le16 bcastprobe;
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_ie_num_ssid_probe {
         struct mrvl_ie_header header;
         __le16 numssidprobe;
-} __attribute__ ((packed));
+} __packed;
 
 struct led_pin {
         u8 led;
         u8 pin;
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_ie_ledgpio {
         struct mrvl_ie_header header;
         struct led_pin ledpin[1];
-} __attribute__ ((packed));
+} __packed;
 
 struct led_bhv {
         uint8_t firmwarestate;
         uint8_t led;
         uint8_t ledstate;
         uint8_t ledarg;
-} __attribute__ ((packed));
+} __packed;
 
 
 struct mrvl_ie_ledbhv {
         struct mrvl_ie_header header;
         struct led_bhv ledbhv[1];
-} __attribute__ ((packed));
+} __packed;
 
 /* Meant to be packed as the value member of a struct ieee80211_info_element.
  * Note that the len member of the ieee80211_info_element varies depending on
@@ -248,12 +248,12 @@ struct mrvl_meshie_val {
         uint8_t mesh_capability;
         uint8_t mesh_id_len;
         uint8_t mesh_id[IEEE80211_MAX_SSID_LEN];
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_meshie {
         u8 id, len;
         struct mrvl_meshie_val val;
-} __attribute__ ((packed));
+} __packed;
 
 struct mrvl_mesh_defaults {
         __le32 bootflag;
@@ -261,6 +261,6 @@ struct mrvl_mesh_defaults {
         uint8_t reserved;
         __le16 channel;
         struct mrvl_meshie meshie;
-} __attribute__ ((packed));
+} __packed;
 
 #endif