From: David S. Miller <davem@davemloft.net>
Date: Mon, 8 Sep 2008 23:59:05 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
X-Git-Tag: v2.6.28-rc1~717^2~306
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=17dce5dfe38ae2fb359b61e855f5d8a3a8b7892b;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'master' of /linux/kernel/git/torvalds/linux-2.6

Conflicts:

	net/mac80211/mlme.c
---

17dce5dfe38ae2fb359b61e855f5d8a3a8b7892b
diff --cc drivers/net/wireless/iwlwifi/iwl-rx.c
index b92a580,e81bfc4..faad4d3
--- a/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 net/mac80211/mlme.c
index c396c35,902cac1..df12e746
--- a/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);
  }