From: David S. Miller <davem@davemloft.net>
Date: Sat, 30 Aug 2008 06:06:00 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.28-rc1~717^2~383
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b171e19ed08c8ba832e5325fadf1be493f56665d;p=linux-2.6-omap-h63xx.git

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

Conflicts:

	net/mac80211/mlme.c
---

b171e19ed08c8ba832e5325fadf1be493f56665d
diff --cc net/mac80211/mlme.c
index e088b440aaf,9bb68c6a8f4..7d53382f1a5
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@@ -497,54 -475,24 +497,24 @@@ 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(dev, IWEVASSOCREQIE, &wrqu,
++		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]);
- 		}
- 	}
- 	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]);
- 		}
+ 	if (ifsta->assocresp_ies) {
+ 		memset(&wrqu, 0, sizeof(wrqu));
+ 		wrqu.data.length = ifsta->assocresp_ies_len;
 -		wireless_send_event(dev, IWEVASSOCRESPIE, &wrqu,
++		wireless_send_event(sdata->dev, IWEVASSOCRESPIE, &wrqu,
+ 				    ifsta->assocresp_ies);
  	}
- 
- 	memset(&wrqu, 0, sizeof(wrqu));
- 	wrqu.data.length = len;
- 	wireless_send_event(sdata->dev, IWEVCUSTOM, &wrqu, buf);
- 
- 	kfree(buf);
  }
  
  
@@@ -2788,13 -2838,13 +2758,13 @@@ static void ieee80211_rx_bss_info(struc
  		       jiffies);
  #endif /* CONFIG_MAC80211_IBSS_DEBUG */
  		if (beacon_timestamp > rx_timestamp) {
- #ifndef CONFIG_MAC80211_IBSS_DEBUG
+ #ifdef CONFIG_MAC80211_IBSS_DEBUG
  			printk(KERN_DEBUG "%s: beacon TSF higher than "
  			       "local TSF - IBSS merge with BSSID %s\n",
 -			       dev->name, print_mac(mac, mgmt->bssid));
 +			       sdata->dev->name, print_mac(mac, mgmt->bssid));
  #endif
 -			ieee80211_sta_join_ibss(dev, &sdata->u.sta, bss);
 -			ieee80211_ibss_add_sta(dev, NULL,
 +			ieee80211_sta_join_ibss(sdata, &sdata->u.sta, bss);
 +			ieee80211_ibss_add_sta(sdata, NULL,
  					       mgmt->bssid, mgmt->sa,
  					       BIT(rx_status->rate_idx));
  		}