From: David S. Miller <davem@davemloft.net>
Date: Sat, 26 Dec 2009 00:34:56 +0000 (-0800)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v2.6.34-rc1~233^2~705
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=d346f49d0badd80aa9fc699fa9c6d5b23e778eb6

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

d346f49d0badd80aa9fc699fa9c6d5b23e778eb6
diff --cc net/mac80211/mesh_hwmp.c
index d28acb6b1f81,664f5cc2b273..ce84237ebad3
--- a/net/mac80211/mesh_hwmp.c
+++ b/net/mac80211/mesh_hwmp.c
@@@ -937,9 -937,9 +937,9 @@@ int mesh_nexthop_lookup(struct sk_buff 
  
  	if (mpath->flags & MESH_PATH_ACTIVE) {
  		if (time_after(jiffies,
 -			       mpath->exp_time +
 +			       mpath->exp_time -
  			       msecs_to_jiffies(sdata->u.mesh.mshcfg.path_refresh_time)) &&
- 		    !memcmp(sdata->dev->dev_addr, hdr->addr4, ETH_ALEN) &&
+ 		    !memcmp(sdata->vif.addr, hdr->addr4, ETH_ALEN) &&
  		    !(mpath->flags & MESH_PATH_RESOLVING) &&
  		    !(mpath->flags & MESH_PATH_FIXED)) {
  			mesh_queue_preq(mpath,
diff --cc net/mac80211/mlme.c
index c79e59f82fd9,5174bfc5710d..2f9ed8b9c3f0
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@@ -1407,10 -1459,9 +1466,10 @@@ ieee80211_rx_mgmt_disassoc(struct ieee8
  	reason_code = le16_to_cpu(mgmt->u.disassoc.reason_code);
  
  	printk(KERN_DEBUG "%s: disassociated from %pM (Reason: %u)\n",
- 			sdata->dev->name, mgmt->sa, reason_code);
+ 			sdata->name, mgmt->sa, reason_code);
  
  	ieee80211_set_disassoc(sdata, false);
 +	ieee80211_recalc_idle(sdata->local);
  	return RX_MGMT_CFG80211_DISASSOC;
  }