From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 24 Aug 2010 20:35:40 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: 2.1b_release~6495^2~679^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=268bae0b6879f238ba57f5f801958d1254e136f7;p=platform%2Fkernel%2Fkernel-mfld-blackbay.git

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6

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

268bae0b6879f238ba57f5f801958d1254e136f7
diff --cc drivers/net/wireless/iwlwifi/iwl-core.c
index ef71300,07dbc27..3d9443b
--- a/drivers/net/wireless/iwlwifi/iwl-core.c
+++ b/drivers/net/wireless/iwlwifi/iwl-core.c
@@@ -1321,51 -1328,25 +1321,6 @@@ out
  EXPORT_SYMBOL(iwl_apm_init);
  
  
- 
- void iwl_configure_filter(struct ieee80211_hw *hw,
- 			  unsigned int changed_flags,
- 			  unsigned int *total_flags,
- 			  u64 multicast)
 -int iwl_set_hw_params(struct iwl_priv *priv)
--{
- 	struct iwl_priv *priv = hw->priv;
- 	__le32 filter_or = 0, filter_nand = 0;
- 
- #define CHK(test, flag)	do { \
- 	if (*total_flags & (test))		\
- 		filter_or |= (flag);		\
- 	else					\
- 		filter_nand |= (flag);		\
- 	} while (0)
- 
- 	IWL_DEBUG_MAC80211(priv, "Enter: changed: 0x%x, total: 0x%x\n",
- 			changed_flags, *total_flags);
- 
- 	CHK(FIF_OTHER_BSS | FIF_PROMISC_IN_BSS, RXON_FILTER_PROMISC_MSK);
- 	CHK(FIF_CONTROL, RXON_FILTER_CTL2HOST_MSK);
- 	CHK(FIF_BCN_PRBRESP_PROMISC, RXON_FILTER_BCON_AWARE_MSK);
- 
- #undef CHK
- 
- 	mutex_lock(&priv->mutex);
- 
- 	priv->staging_rxon.filter_flags &= ~filter_nand;
- 	priv->staging_rxon.filter_flags |= filter_or;
 -	priv->hw_params.max_rxq_size = RX_QUEUE_SIZE;
 -	priv->hw_params.max_rxq_log = RX_QUEUE_SIZE_LOG;
 -	if (priv->cfg->mod_params->amsdu_size_8K)
 -		priv->hw_params.rx_page_order = get_order(IWL_RX_BUF_SIZE_8K);
 -	else
 -		priv->hw_params.rx_page_order = get_order(IWL_RX_BUF_SIZE_4K);
--
- 	iwlcore_commit_rxon(priv);
 -	priv->hw_params.max_beacon_itrvl = IWL_MAX_UCODE_BEACON_INTERVAL;
--
- 	mutex_unlock(&priv->mutex);
 -	if (priv->cfg->mod_params->disable_11n)
 -		priv->cfg->sku &= ~IWL_SKU_N;
--
- 	/*
- 	 * Receiving all multicast frames is always enabled by the
- 	 * default flags setup in iwl_connection_init_rx_config()
- 	 * since we currently do not support programming multicast
- 	 * filters into the device.
- 	 */
- 	*total_flags &= FIF_OTHER_BSS | FIF_ALLMULTI | FIF_PROMISC_IN_BSS |
- 			FIF_BCN_PRBRESP_PROMISC | FIF_CONTROL;
 -	/* Device-specific setup */
 -	return priv->cfg->ops->lib->set_hw_params(priv);
--}
- EXPORT_SYMBOL(iwl_configure_filter);
 -EXPORT_SYMBOL(iwl_set_hw_params);
--
  int iwl_set_tx_power(struct iwl_priv *priv, s8 tx_power, bool force)
  {
  	int ret = 0;
diff --cc drivers/net/wireless/iwlwifi/iwl-core.h
index 870c62d,5e6ee3d..7b1e832
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@@ -389,9 -372,7 +389,6 @@@ int iwl_set_decrypted_flag(struct iwl_p
  			   u32 decrypt_res,
  			   struct ieee80211_rx_status *stats);
  void iwl_irq_handle_error(struct iwl_priv *priv);
- void iwl_configure_filter(struct ieee80211_hw *hw,
- 			  unsigned int changed_flags,
- 			  unsigned int *total_flags, u64 multicast);
 -int iwl_set_hw_params(struct iwl_priv *priv);
  void iwl_post_associate(struct iwl_priv *priv, struct ieee80211_vif *vif);
  void iwl_bss_info_changed(struct ieee80211_hw *hw,
  				     struct ieee80211_vif *vif,
diff --cc drivers/net/wireless/iwlwifi/iwl-dev.h
index f72fbf4,2e97cd2..1ad3303
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@@ -1061,8 -1049,10 +1061,9 @@@ struct iwl_event_log 
  #define IWL_DELAY_NEXT_FORCE_FW_RELOAD (HZ*5)
  
  /* timer constants use to monitor and recover stuck tx queues in mSecs */
- #define IWL_MONITORING_PERIOD  (1000)
+ #define IWL_DEF_MONITORING_PERIOD	(1000)
+ #define IWL_LONG_MONITORING_PERIOD	(5000)
  #define IWL_ONE_HUNDRED_MSECS   (100)
 -#define IWL_SIXTY_SECS          (60000)
  
  enum iwl_reset {
  	IWL_RF_RESET = 0,
diff --cc drivers/net/wireless/p54/fwio.c
index 6f027ab,15b20c2..92b9b1f
--- a/drivers/net/wireless/p54/fwio.c
+++ b/drivers/net/wireless/p54/fwio.c
@@@ -123,14 -123,10 +123,14 @@@ int p54_parse_firmware(struct ieee80211
  		bootrec = (struct bootrec *)&bootrec->data[len];
  	}
  
 -	if (fw_version)
 +	if (fw_version) {
  		wiphy_info(priv->hw->wiphy,
- 			   "fw rev %s - softmac protocol %x.%x\n",
+ 			   "FW rev %s - Softmac protocol %x.%x\n",
  			   fw_version, priv->fw_var >> 8, priv->fw_var & 0xff);
 +		snprintf(dev->wiphy->fw_version, sizeof(dev->wiphy->fw_version),
 +				"%s - %x.%x", fw_version,
 +				priv->fw_var >> 8, priv->fw_var & 0xff);
 +	}
  
  	if (priv->fw_var < 0x500)
  		wiphy_info(priv->hw->wiphy,