From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 27 Jul 2010 15:59:19 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluet... 
X-Git-Tag: v2.6.36-rc1~571^2~64^2~48
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=800f65bba8d2030b3fef62850e203f9f176625a8;p=platform%2Fkernel%2Flinux-exynos.git

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

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

800f65bba8d2030b3fef62850e203f9f176625a8
diff --cc drivers/net/wireless/airo.c
index 053f90c,6b605df..1d05445
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@@ -5162,15 -5162,8 +5162,8 @@@ static void proc_SSID_on_close(struct i
  	enable_MAC(ai, 1);
  }
  
- static inline u8 hexVal(char c) {
- 	if (c>='0' && c<='9') return c -= '0';
- 	if (c>='a' && c<='f') return c -= 'a'-10;
- 	if (c>='A' && c<='F') return c -= 'A'-10;
- 	return 0;
- }
- 
  static void proc_APList_on_close( struct inode *inode, struct file *file ) {
 -	struct proc_data *data = (struct proc_data *)file->private_data;
 +	struct proc_data *data = file->private_data;
  	struct proc_dir_entry *dp = PDE(inode);
  	struct net_device *dev = dp->data;
  	struct airo_info *ai = dev->ml_priv;
diff --cc drivers/net/wireless/iwlwifi/iwl-commands.h
index 9c44ab5,8d2db9d..60725a5
--- a/drivers/net/wireless/iwlwifi/iwl-commands.h
+++ b/drivers/net/wireless/iwlwifi/iwl-commands.h
@@@ -3035,9 -3035,8 +3035,9 @@@ struct iwl39_statistics_tx 
  struct statistics_dbg {
  	__le32 burst_check;
  	__le32 burst_count;
 -	__le32 reserved[4];
 +	__le32 wait_for_silence_timeout_cnt;
 +	__le32 reserved[3];
- } __attribute__ ((packed));
+ } __packed;
  
  struct iwl39_statistics_div {
  	__le32 tx_on_a;
@@@ -3125,29 -3124,15 +3125,29 @@@ struct statistics_rx_non_phy 
  	__le32 beacon_energy_a;
  	__le32 beacon_energy_b;
  	__le32 beacon_energy_c;
- } __attribute__ ((packed));
+ } __packed;
  
 +struct statistics_rx_non_phy_bt {
 +	struct statistics_rx_non_phy common;
 +	/* additional stats for bt */
 +	__le32 num_bt_kills;
 +	__le32 reserved[2];
 +} __packed;
 +
  struct statistics_rx {
  	struct statistics_rx_phy ofdm;
  	struct statistics_rx_phy cck;
  	struct statistics_rx_non_phy general;
  	struct statistics_rx_ht_phy ofdm_ht;
- } __attribute__ ((packed));
+ } __packed;
  
 +struct statistics_rx_bt {
 +	struct statistics_rx_phy ofdm;
 +	struct statistics_rx_phy cck;
 +	struct statistics_rx_non_phy_bt general;
 +	struct statistics_rx_ht_phy ofdm_ht;
 +} __packed;
 +
  /**
   * struct statistics_tx_power - current tx power
   *
@@@ -3208,9 -3193,9 +3208,9 @@@ struct statistics_div 
  	__le32 probe_time;
  	__le32 reserved1;
  	__le32 reserved2;
- } __attribute__ ((packed));
+ } __packed;
  
 -struct statistics_general {
 +struct statistics_general_common {
  	__le32 temperature;   /* radio temperature */
  	__le32 temperature_m; /* for 5000 and up, this is radio voltage */
  	struct statistics_dbg dbg;
@@@ -3226,33 -3211,9 +3226,33 @@@
  	 *  in order to get out of bad PHY status
  	 */
  	__le32 num_of_sos_states;
 +} __packed;
 +
 +struct statistics_bt_activity {
 +	/* Tx statistics */
 +	__le32 hi_priority_tx_req_cnt;
 +	__le32 hi_priority_tx_denied_cnt;
 +	__le32 lo_priority_tx_req_cnt;
 +	__le32 lo_priority_tx_denied_cnt;
 +	/* Rx statistics */
 +	__le32 hi_priority_rx_req_cnt;
 +	__le32 hi_priority_rx_denied_cnt;
 +	__le32 lo_priority_rx_req_cnt;
 +	__le32 lo_priority_rx_denied_cnt;
 +} __packed;
 +
 +struct statistics_general {
 +	struct statistics_general_common common;
 +	__le32 reserved2;
 +	__le32 reserved3;
 +} __packed;
 +
 +struct statistics_general_bt {
 +	struct statistics_general_common common;
 +	struct statistics_bt_activity activity;
  	__le32 reserved2;
  	__le32 reserved3;
- } __attribute__ ((packed));
+ } __packed;
  
  #define UCODE_STATISTICS_CLEAR_MSK		(0x1 << 0)
  #define UCODE_STATISTICS_FREQUENCY_MSK		(0x1 << 1)
@@@ -3309,14 -3270,8 +3309,14 @@@ struct iwl_notif_statistics 
  	struct statistics_rx rx;
  	struct statistics_tx tx;
  	struct statistics_general general;
- } __attribute__ ((packed));
+ } __packed;
  
 +struct iwl_bt_notif_statistics {
 +	__le32 flag;
 +	struct statistics_rx_bt rx;
 +	struct statistics_tx tx;
 +	struct statistics_general_bt general;
 +} __packed;
  
  /*
   * MISSED_BEACONS_NOTIFICATION = 0xa2 (notification only, not a command)
diff --cc drivers/net/wireless/wl12xx/wl1251_cmd.h
index ca1cb24,7e70dd5..a9e4991
--- a/drivers/net/wireless/wl12xx/wl1251_cmd.h
+++ b/drivers/net/wireless/wl12xx/wl1251_cmd.h
@@@ -201,11 -201,11 +201,11 @@@ struct wl1251_scan_parameters 
  	u8 ssid_len;
  	u8 ssid[32];
  
- } __attribute__ ((packed));
+ } __packed;
  
  struct wl1251_scan_ch_parameters {
 -	u32 min_duration; /* in TU */
 -	u32 max_duration; /* in TU */
 +	__le32 min_duration; /* in TU */
 +	__le32 max_duration; /* in TU */
  	u32 bssid_lsb;
  	u16 bssid_msb;