From: David S. Miller <davem@davemloft.net>
Date: Wed, 21 Apr 2010 08:14:25 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: MMI-PSA29.97-13-9~23873^2~430
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=87eb367003887cdc81a5d183efea227b5b488961;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-6000.c
	net/core/dev.c
---

87eb367003887cdc81a5d183efea227b5b488961
diff --cc drivers/net/wireless/iwlwifi/iwl-6000.c
index dd03384432f4,92b3e64fc14d..3e32693d1c2f
--- a/drivers/net/wireless/iwlwifi/iwl-6000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
@@@ -256,13 -254,13 +256,14 @@@ static struct iwl_lib_ops iwl6000_lib 
  	},
  	.eeprom_ops = {
  		.regulatory_bands = {
 -			EEPROM_5000_REG_BAND_1_CHANNELS,
 -			EEPROM_5000_REG_BAND_2_CHANNELS,
 -			EEPROM_5000_REG_BAND_3_CHANNELS,
 -			EEPROM_5000_REG_BAND_4_CHANNELS,
 -			EEPROM_5000_REG_BAND_5_CHANNELS,
 +			EEPROM_REG_BAND_1_CHANNELS,
 +			EEPROM_REG_BAND_2_CHANNELS,
 +			EEPROM_REG_BAND_3_CHANNELS,
 +			EEPROM_REG_BAND_4_CHANNELS,
 +			EEPROM_REG_BAND_5_CHANNELS,
 +			EEPROM_REG_BAND_24_HT40_CHANNELS,
+ 			EEPROM_6000_REG_BAND_24_HT40_CHANNELS,
 -			EEPROM_5000_REG_BAND_52_HT40_CHANNELS
 +			EEPROM_REG_BAND_52_HT40_CHANNELS
  		},
  		.verify_signature  = iwlcore_eeprom_verify_signature,
  		.acquire_semaphore = iwlcore_eeprom_acquire_semaphore,
@@@ -323,13 -318,13 +324,13 @@@ static struct iwl_lib_ops iwl6050_lib 
  	},
  	.eeprom_ops = {
  		.regulatory_bands = {
 -			EEPROM_5000_REG_BAND_1_CHANNELS,
 -			EEPROM_5000_REG_BAND_2_CHANNELS,
 -			EEPROM_5000_REG_BAND_3_CHANNELS,
 -			EEPROM_5000_REG_BAND_4_CHANNELS,
 -			EEPROM_5000_REG_BAND_5_CHANNELS,
 +			EEPROM_REG_BAND_1_CHANNELS,
 +			EEPROM_REG_BAND_2_CHANNELS,
 +			EEPROM_REG_BAND_3_CHANNELS,
 +			EEPROM_REG_BAND_4_CHANNELS,
 +			EEPROM_REG_BAND_5_CHANNELS,
- 			EEPROM_REG_BAND_24_HT40_CHANNELS,
+ 			EEPROM_6000_REG_BAND_24_HT40_CHANNELS,
 -			EEPROM_5000_REG_BAND_52_HT40_CHANNELS
 +			EEPROM_REG_BAND_52_HT40_CHANNELS
  		},
  		.verify_signature  = iwlcore_eeprom_verify_signature,
  		.acquire_semaphore = iwlcore_eeprom_acquire_semaphore,
diff --cc drivers/net/wireless/iwlwifi/iwl-eeprom.h
index cb6d50b78140,8171c701e4e1..ef0e3256eec2
--- a/drivers/net/wireless/iwlwifi/iwl-eeprom.h
+++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.h
@@@ -188,21 -188,25 +188,25 @@@ struct iwl_eeprom_enhanced_txpwr 
  /* 5000 regulatory - indirect access */
  #define EEPROM_5000_REG_SKU_ID ((0x02)\
  		| INDIRECT_ADDRESS | INDIRECT_REGULATORY)   /* 4  bytes */
 -#define EEPROM_5000_REG_BAND_1_CHANNELS       ((0x08)\
 +#define EEPROM_REG_BAND_1_CHANNELS       ((0x08)\
  		| INDIRECT_ADDRESS | INDIRECT_REGULATORY)   /* 28 bytes */
 -#define EEPROM_5000_REG_BAND_2_CHANNELS       ((0x26)\
 +#define EEPROM_REG_BAND_2_CHANNELS       ((0x26)\
  		| INDIRECT_ADDRESS | INDIRECT_REGULATORY)   /* 26 bytes */
 -#define EEPROM_5000_REG_BAND_3_CHANNELS       ((0x42)\
 +#define EEPROM_REG_BAND_3_CHANNELS       ((0x42)\
  		| INDIRECT_ADDRESS | INDIRECT_REGULATORY)   /* 24 bytes */
 -#define EEPROM_5000_REG_BAND_4_CHANNELS       ((0x5C)\
 +#define EEPROM_REG_BAND_4_CHANNELS       ((0x5C)\
  		| INDIRECT_ADDRESS | INDIRECT_REGULATORY)   /* 22 bytes */
 -#define EEPROM_5000_REG_BAND_5_CHANNELS       ((0x74)\
 +#define EEPROM_REG_BAND_5_CHANNELS       ((0x74)\
  		| INDIRECT_ADDRESS | INDIRECT_REGULATORY)   /* 12 bytes */
 -#define EEPROM_5000_REG_BAND_24_HT40_CHANNELS  ((0x82)\
 +#define EEPROM_REG_BAND_24_HT40_CHANNELS  ((0x82)\
  		| INDIRECT_ADDRESS | INDIRECT_REGULATORY)   /* 14  bytes */
 -#define EEPROM_5000_REG_BAND_52_HT40_CHANNELS  ((0x92)\
 +#define EEPROM_REG_BAND_52_HT40_CHANNELS  ((0x92)\
  		| INDIRECT_ADDRESS | INDIRECT_REGULATORY)   /* 22  bytes */
  
+ /* 6000 regulatory - indirect access */
+ #define EEPROM_6000_REG_BAND_24_HT40_CHANNELS  ((0x80)\
+ 		| INDIRECT_ADDRESS | INDIRECT_REGULATORY)   /* 14  bytes */
+ 
  /* 6000 and up regulatory tx power - indirect access */
  /* max. elements per section */
  #define EEPROM_MAX_TXPOWER_SECTION_ELEMENTS	(8)
diff --cc drivers/net/wireless/iwlwifi/iwl-scan.c
index ae981932ce61,12e455a4b90e..de0446d4bfe9
--- a/drivers/net/wireless/iwlwifi/iwl-scan.c
+++ b/drivers/net/wireless/iwlwifi/iwl-scan.c
@@@ -577,10 -586,10 +586,9 @@@ static void iwl_bg_start_internal_scan(
  	set_bit(STATUS_SCANNING, &priv->status);
  	priv->is_internal_short_scan = true;
  	queue_work(priv->workqueue, &priv->request_scan);
- 
- out:
- 	return ret;
+  unlock:
+ 	mutex_unlock(&priv->mutex);
  }
 -EXPORT_SYMBOL(iwl_internal_short_hw_scan);
  
  #define IWL_SCAN_CHECK_WATCHDOG (7 * HZ)
  
diff --cc net/core/dev.c
index b31d5d69a467,f769098774b7..e904c476b112
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@@ -2015,8 -1989,12 +2015,12 @@@ static struct netdev_queue *dev_pick_tx
  			if (dev->real_num_tx_queues > 1)
  				queue_index = skb_tx_hash(dev, skb);
  
- 			if (sk && rcu_dereference_check(sk->sk_dst_cache, 1))
- 				sk_tx_queue_set(sk, queue_index);
+ 			if (sk) {
 -				struct dst_entry *dst = rcu_dereference_bh(sk->sk_dst_cache);
++				struct dst_entry *dst = rcu_dereference_check(sk->sk_dst_cache, 1);
+ 
+ 				if (dst && skb_dst(skb) == dst)
+ 					sk_tx_queue_set(sk, queue_index);
+ 			}
  		}
  	}