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

Conflicts:

	net/mac80211/mlme.c

diff --cc drivers/net/ixgbe/ixgbe_main.c
Simple merge

diff --cc drivers/net/wireless/ath9k/hw.c
Simple merge

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

diff --cc drivers/net/wireless/ath9k/recv.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-agn-rs.c
Simple merge

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

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

diff --cc drivers/net/wireless/iwlwifi/iwl-dev.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-rx.c
index b92a580ed2f9c1fb0081c844b0bcf598512c34f9,e81bfc42a7cb7ced067f255641ade21107e03963..faad4d3f56e10617d304bfdaef4ead180717d8f2
--- 1/drivers/net/wireless/iwlwifi/iwl-rx.c
--- 2/drivers/net/wireless/iwlwifi/iwl-rx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-rx.c
@@@ -1067,8 -1171,12 +1067,11 @@@ void iwl_rx_reply_rx(struct iwl_priv *p
        if (rx_status.band == IEEE80211_BAND_5GHZ)
                rx_status.rate_idx -= IWL_FIRST_OFDM_RATE;
  
 -      rx_status.antenna = 0;
        rx_status.flag = 0;
-       rx_status.flag |= RX_FLAG_TSFT;
+ 
+       /* TSF isn't reliable. In order to allow smooth user experience,
+        * this W/A doesn't propagate it to the mac80211 */
+       /*rx_status.flag |= RX_FLAG_TSFT;*/
  
        if ((unlikely(rx_start->cfg_phy_cnt > 20))) {
                IWL_DEBUG_DROP("dsp size out of range [0,20]: %d/n",

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

diff --cc drivers/net/wireless/libertas/if_cs.c
Simple merge

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

diff --cc drivers/net/wireless/rt2x00/rt2x00reg.h
Simple merge

diff --cc net/bridge/br_ioctl.c
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/ipv4/tcp_ipv4.c
Simple merge

diff --cc net/mac80211/ieee80211_i.h
Simple merge

diff --cc net/mac80211/mlme.c
index c396c3522f7b9d6c94b7d6bbc79fe9e63d976bde,902cac1bd246ab7f861cb2f1aa8b3c06168dc33a..df12e746b03e24d5988ca99a85b85888adae205f
--- 1/net/mac80211/mlme.c
--- 2/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@@ -497,24 -475,54 +497,23 @@@ int ieee80211_ht_addt_info_ie_to_ht_bss
        return 0;
  }
  
 -static void ieee80211_sta_send_associnfo(struct net_device *dev,
 +static void ieee80211_sta_send_associnfo(struct ieee80211_sub_if_data *sdata,
                                         struct ieee80211_if_sta *ifsta)
  {
 -      char *buf;
 -      size_t len;
 -      int i;
        union iwreq_data wrqu;
  
 -      if (!ifsta->assocreq_ies && !ifsta->assocresp_ies)
 -              return;
 -
 -      buf = kmalloc(50 + 2 * (ifsta->assocreq_ies_len +
 -                              ifsta->assocresp_ies_len), GFP_KERNEL);
 -      if (!buf)
 -              return;
 -
 -      len = sprintf(buf, "ASSOCINFO(");
        if (ifsta->assocreq_ies) {
 -              len += sprintf(buf + len, "ReqIEs=");
 -              for (i = 0; i < ifsta->assocreq_ies_len; i++) {
 -                      len += sprintf(buf + len, "%02x",
 -                                     ifsta->assocreq_ies[i]);
 -              }
 +              memset(&wrqu, 0, sizeof(wrqu));
 +              wrqu.data.length = ifsta->assocreq_ies_len;
 +              wireless_send_event(sdata->dev, IWEVASSOCREQIE, &wrqu,
 +                                  ifsta->assocreq_ies);
        }
- 
        if (ifsta->assocresp_ies) {
 -              if (ifsta->assocreq_ies)
 -                      len += sprintf(buf + len, " ");
 -              len += sprintf(buf + len, "RespIEs=");
 -              for (i = 0; i < ifsta->assocresp_ies_len; i++) {
 -                      len += sprintf(buf + len, "%02x",
 -                                     ifsta->assocresp_ies[i]);
 -              }
 +              memset(&wrqu, 0, sizeof(wrqu));
 +              wrqu.data.length = ifsta->assocresp_ies_len;
 +              wireless_send_event(sdata->dev, IWEVASSOCRESPIE, &wrqu,
 +                                  ifsta->assocresp_ies);
        }
 -      len += sprintf(buf + len, ")");
 -
 -      if (len > IW_CUSTOM_MAX) {
 -              len = sprintf(buf, "ASSOCRESPIE=");
 -              for (i = 0; i < ifsta->assocresp_ies_len; i++) {
 -                      len += sprintf(buf + len, "%02x",
 -                                     ifsta->assocresp_ies[i]);
 -              }
 -      }
 -
 -      memset(&wrqu, 0, sizeof(wrqu));
 -      wrqu.data.length = len;
 -      wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf);
 -
 -      kfree(buf);
  }