From: David S. Miller <davem@davemloft.net>
Date: Fri, 23 Jul 2010 21:03:38 +0000 (-0700)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: master-2010-08-04~128
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=2a88e7e559f2358f4e1422d0b0c0278a74136581;p=~andy%2Flinux

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

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

2a88e7e559f2358f4e1422d0b0c0278a74136581
diff --cc drivers/net/wireless/airo.c
index 6b605df8a92,053f90c7aa1..1d05445d4ba
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@@ -5162,8 -5162,15 +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 8d2db9d2204,83247f7e019..bd1ec933cd9
--- a/drivers/net/wireless/iwlwifi/iwl-commands.h
+++ b/drivers/net/wireless/iwlwifi/iwl-commands.h
@@@ -3035,8 -3035,9 +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;