Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

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

diff --cc drivers/net/wireless/at76c50x-usb.c
Simple merge

diff --cc drivers/net/wireless/ath/ar9170/main.c
Simple merge

diff --cc drivers/net/wireless/ipw2x00/ipw2100.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-1000.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-4965.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-5000.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-6000.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-agn.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-core.c
index ef713003682eca3d64ee2b295671613f06f867c4,07dbc27964480eebedb67760029dcadab9584f84..3d9443b9bec14772774361e4793d789a1804fa68
--- 1/drivers/net/wireless/iwlwifi/iwl-core.c
--- 2/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 870c62d438a820bef0a5967ab081c22dfd521cf0,5e6ee3da6bbf740846033e4a57e44956e326a73c..7b1e832bae56a9e52b8ad6b8846e32e98a251e1b
--- 1/drivers/net/wireless/iwlwifi/iwl-core.h
--- 2/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 f72fbf4dc92bba38588db40e97c5d6523c85a389,2e97cd2fa98a6e0c7d9cdc6d98582ac54fe28459..1ad330342ffc605f0938bfc6fd24b1183a14a623
--- 1/drivers/net/wireless/iwlwifi/iwl-dev.h
--- 2/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/iwlwifi/iwl3945-base.c
Simple merge

diff --cc drivers/net/wireless/mac80211_hwsim.c
Simple merge

diff --cc drivers/net/wireless/p54/eeprom.c
Simple merge

diff --cc drivers/net/wireless/p54/fwio.c
index 6f027ab4c7750831142933cce25c203186aed366,15b20c29a6042ae6e3dc5c99dae07e8c317127ca..92b9b1f05fd536d4ed529a73b92d1ea198189923
--- 1/drivers/net/wireless/p54/fwio.c
--- 2/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,

diff --cc drivers/net/wireless/p54/txrx.c
Simple merge

diff --cc drivers/net/wireless/rtl818x/rtl8180_dev.c
Simple merge

diff --cc drivers/net/wireless/rtl818x/rtl8187_dev.c
Simple merge