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

1 files changed, 33 insertions, 33 deletions

diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index e3f130c4eaff..0e34260b22b1 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -428,7 +428,7 @@ struct mwl8k_cmd_pkt {
         __u8    macid;
         __le16  result;
         char    payload[0];
-} __attribute__((packed));
+} __packed;
 
 /*
  * Firmware loading.
@@ -634,7 +634,7 @@ struct mwl8k_dma_data {
         __le16 fwlen;
         struct ieee80211_hdr wh;
         char data[0];
-} __attribute__((packed));
+} __packed;
 
 /* Routines to add/remove DMA header from skb.  */
 static inline void mwl8k_remove_dma_header(struct sk_buff *skb, __le16 qos)
@@ -713,7 +713,7 @@ struct mwl8k_rxd_8366_ap {
         __u8 rx_status;
         __u8 channel;
         __u8 rx_ctrl;
-} __attribute__((packed));
+} __packed;
 
 #define MWL8K_8366_AP_RATE_INFO_MCS_FORMAT      0x80
 #define MWL8K_8366_AP_RATE_INFO_40MHZ           0x40
@@ -808,7 +808,7 @@ struct mwl8k_rxd_sta {
         __u8 rx_ctrl;
         __u8 rx_status;
         __u8 pad2[2];
-} __attribute__((packed));
+} __packed;
 
 #define MWL8K_STA_RATE_INFO_SHORTPRE            0x8000
 #define MWL8K_STA_RATE_INFO_ANTSELECT(x)        (((x) >> 11) & 0x3)
@@ -1122,7 +1122,7 @@ struct mwl8k_tx_desc {
         __le16 rate_info;
         __u8 peer_id;
         __u8 tx_frag_cnt;
-} __attribute__((packed));
+} __packed;
 
 #define MWL8K_TX_DESCS          128
 
@@ -1668,7 +1668,7 @@ struct mwl8k_cmd_get_hw_spec_sta {
         __le32 caps2;
         __le32 num_tx_desc_per_queue;
         __le32 total_rxd;
-} __attribute__((packed));
+} __packed;
 
 #define MWL8K_CAP_MAX_AMSDU             0x20000000
 #define MWL8K_CAP_GREENFIELD            0x08000000
@@ -1812,7 +1812,7 @@ struct mwl8k_cmd_get_hw_spec_ap {
         __le32 wcbbase1;
         __le32 wcbbase2;
         __le32 wcbbase3;
-} __attribute__((packed));
+} __packed;
 
 static int mwl8k_cmd_get_hw_spec_ap(struct ieee80211_hw *hw)
 {
@@ -1885,7 +1885,7 @@ struct mwl8k_cmd_set_hw_spec {
         __le32 flags;
         __le32 num_tx_desc_per_queue;
         __le32 total_rxd;
-} __attribute__((packed));
+} __packed;
 
 #define MWL8K_SET_HW_SPEC_FLAG_HOST_DECR_MGMT           0x00000080
 #define MWL8K_SET_HW_SPEC_FLAG_HOSTFORM_PROBERESP       0x00000020
@@ -1987,7 +1987,7 @@ __mwl8k_cmd_mac_multicast_adr(struct ieee80211_hw *hw, int allmulti,
 struct mwl8k_cmd_get_stat {
         struct mwl8k_cmd_pkt header;
         __le32 stats[64];
-} __attribute__((packed));
+} __packed;
 
 #define MWL8K_STAT_ACK_FAILURE  9
 #define MWL8K_STAT_RTS_FAILURE  12
@@ -2031,7 +2031,7 @@ struct mwl8k_cmd_radio_control {
         __le16 action;
         __le16 control;
         __le16 radio_on;
-} __attribute__((packed));
+} __packed;
 
 static int
 mwl8k_cmd_radio_control(struct ieee80211_hw *hw, bool enable, bool force)
@@ -2094,7 +2094,7 @@ struct mwl8k_cmd_rf_tx_power {
         __le16 current_level;
         __le16 reserved;
         __le16 power_level_list[MWL8K_TX_POWER_LEVEL_TOTAL];
-} __attribute__((packed));
+} __packed;
 
 static int mwl8k_cmd_rf_tx_power(struct ieee80211_hw *hw, int dBm)
 {
@@ -2123,7 +2123,7 @@ struct mwl8k_cmd_rf_antenna {
         struct mwl8k_cmd_pkt header;
         __le16 antenna;
         __le16 mode;
-} __attribute__((packed));
+} __packed;
 
 #define MWL8K_RF_ANTENNA_RX             1
 #define MWL8K_RF_ANTENNA_TX             2
@@ -2184,7 +2184,7 @@ static int mwl8k_cmd_set_beacon(struct ieee80211_hw *hw,
  */
 struct mwl8k_cmd_set_pre_scan {
         struct mwl8k_cmd_pkt header;
-} __attribute__((packed));
+} __packed;
 
 static int mwl8k_cmd_set_pre_scan(struct ieee80211_hw *hw)
 {
@@ -2211,7 +2211,7 @@ struct mwl8k_cmd_set_post_scan {
         struct mwl8k_cmd_pkt header;
         __le32 isibss;
         __u8 bssid[ETH_ALEN];
-} __attribute__((packed));
+} __packed;
 
 static int
 mwl8k_cmd_set_post_scan(struct ieee80211_hw *hw, const __u8 *mac)
@@ -2242,7 +2242,7 @@ struct mwl8k_cmd_set_rf_channel {
         __le16 action;
         __u8 current_channel;
         __le32 channel_flags;
-} __attribute__((packed));
+} __packed;
 
 static int mwl8k_cmd_set_rf_channel(struct ieee80211_hw *hw,
                                     struct ieee80211_conf *conf)
@@ -2295,7 +2295,7 @@ struct mwl8k_cmd_update_set_aid {
         __u8    bssid[ETH_ALEN];
         __le16  protection_mode;
         __u8    supp_rates[14];
-} __attribute__((packed));
+} __packed;
 
 static void legacy_rate_mask_to_array(u8 *rates, u32 mask)
 {
@@ -2366,7 +2366,7 @@ struct mwl8k_cmd_set_rate {
         /* Bitmap for supported MCS codes.  */
         __u8    mcs_set[16];
         __u8    reserved[16];
-} __attribute__((packed));
+} __packed;
 
 static int
 mwl8k_cmd_set_rate(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
@@ -2399,7 +2399,7 @@ struct mwl8k_cmd_finalize_join {
         struct mwl8k_cmd_pkt header;
         __le32 sleep_interval;  /* Number of beacon periods to sleep */
         __u8 beacon_data[MWL8K_FJ_BEACON_MAXLEN];
-} __attribute__((packed));
+} __packed;
 
 static int mwl8k_cmd_finalize_join(struct ieee80211_hw *hw, void *frame,
                                    int framelen, int dtim)
@@ -2438,7 +2438,7 @@ struct mwl8k_cmd_set_rts_threshold {
         struct mwl8k_cmd_pkt header;
         __le16 action;
         __le16 threshold;
-} __attribute__((packed));
+} __packed;
 
 static int
 mwl8k_cmd_set_rts_threshold(struct ieee80211_hw *hw, int rts_thresh)
@@ -2468,7 +2468,7 @@ struct mwl8k_cmd_set_slot {
         struct mwl8k_cmd_pkt header;
         __le16 action;
         __u8 short_slot;
-} __attribute__((packed));
+} __packed;
 
 static int mwl8k_cmd_set_slot(struct ieee80211_hw *hw, bool short_slot_time)
 {
@@ -2530,7 +2530,7 @@ struct mwl8k_cmd_set_edca_params {
                         __u8 txq;
                 } sta;
         };
-} __attribute__((packed));
+} __packed;
 
 #define MWL8K_SET_EDCA_CW       0x01
 #define MWL8K_SET_EDCA_TXOP     0x02
@@ -2581,7 +2581,7 @@ mwl8k_cmd_set_edca_params(struct ieee80211_hw *hw, __u8 qnum,
 struct mwl8k_cmd_set_wmm_mode {
         struct mwl8k_cmd_pkt header;
         __le16 action;
-} __attribute__((packed));
+} __packed;
 
 static int mwl8k_cmd_set_wmm_mode(struct ieee80211_hw *hw, bool enable)
 {
@@ -2614,7 +2614,7 @@ struct mwl8k_cmd_mimo_config {
         __le32 action;
         __u8 rx_antenna_map;
         __u8 tx_antenna_map;
-} __attribute__((packed));
+} __packed;
 
 static int mwl8k_cmd_mimo_config(struct ieee80211_hw *hw, __u8 rx, __u8 tx)
 {
@@ -2654,7 +2654,7 @@ struct mwl8k_cmd_use_fixed_rate_sta {
         __le32 rate_type;
         __le32 reserved1;
         __le32 reserved2;
-} __attribute__((packed));
+} __packed;
 
 #define MWL8K_USE_AUTO_RATE     0x0002
 #define MWL8K_UCAST_RATE        0
@@ -2696,7 +2696,7 @@ struct mwl8k_cmd_use_fixed_rate_ap {
         u8 multicast_rate;
         u8 multicast_rate_type;
         u8 management_rate;
-} __attribute__((packed));
+} __packed;
 
 static int
 mwl8k_cmd_use_fixed_rate_ap(struct ieee80211_hw *hw, int mcast, int mgmt)
@@ -2726,7 +2726,7 @@ mwl8k_cmd_use_fixed_rate_ap(struct ieee80211_hw *hw, int mcast, int mgmt)
 struct mwl8k_cmd_enable_sniffer {
         struct mwl8k_cmd_pkt header;
         __le32 action;
-} __attribute__((packed));
+} __packed;
 
 static int mwl8k_cmd_enable_sniffer(struct ieee80211_hw *hw, bool enable)
 {
@@ -2759,7 +2759,7 @@ struct mwl8k_cmd_set_mac_addr {
                 } mbss;
                 __u8 mac_addr[ETH_ALEN];
         };
-} __attribute__((packed));
+} __packed;
 
 #define MWL8K_MAC_TYPE_PRIMARY_CLIENT           0
 #define MWL8K_MAC_TYPE_SECONDARY_CLIENT         1
@@ -2814,7 +2814,7 @@ struct mwl8k_cmd_set_rate_adapt_mode {
         struct mwl8k_cmd_pkt header;
         __le16 action;
         __le16 mode;
-} __attribute__((packed));
+} __packed;
 
 static int mwl8k_cmd_set_rateadapt_mode(struct ieee80211_hw *hw, __u16 mode)
 {
@@ -2842,7 +2842,7 @@ static int mwl8k_cmd_set_rateadapt_mode(struct ieee80211_hw *hw, __u16 mode)
 struct mwl8k_cmd_bss_start {
         struct mwl8k_cmd_pkt header;
         __le32 enable;
-} __attribute__((packed));
+} __packed;
 
 static int mwl8k_cmd_bss_start(struct ieee80211_hw *hw,
                                struct ieee80211_vif *vif, int enable)
@@ -2887,7 +2887,7 @@ struct mwl8k_cmd_set_new_stn {
         __u8 add_qos_info;
         __u8 is_qos_sta;
         __le32 fw_sta_ptr;
-} __attribute__((packed));
+} __packed;
 
 #define MWL8K_STA_ACTION_ADD            0
 #define MWL8K_STA_ACTION_REMOVE         2
@@ -2980,7 +2980,7 @@ struct ewc_ht_info {
         __le16  control1;
         __le16  control2;
         __le16  control3;
-} __attribute__((packed));
+} __packed;
 
 struct peer_capability_info {
         /* Peer type - AP vs. STA.  */
@@ -3009,7 +3009,7 @@ struct peer_capability_info {
         __u8    pad2;
         __u8    station_id;
         __le16  amsdu_enabled;
-} __attribute__((packed));
+} __packed;
 
 struct mwl8k_cmd_update_stadb {
         struct mwl8k_cmd_pkt header;
@@ -3024,7 +3024,7 @@ struct mwl8k_cmd_update_stadb {
 
         /* Peer info - valid during add/update.  */
         struct peer_capability_info     peer_info;
-} __attribute__((packed));
+} __packed;
 
 #define MWL8K_STA_DB_MODIFY_ENTRY       1
 #define MWL8K_STA_DB_DEL_ENTRY          2