From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 28 Dec 2009 20:09:11 +0000 (-0500)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ea1e4b842049fcc4741096538114871a74859314;p=linux-beck.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
---

ea1e4b842049fcc4741096538114871a74859314
diff --cc net/mac80211/mesh_hwmp.c
index 664f5cc2b273,d28acb6b1f81..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 5174bfc5710d,c79e59f82fd9..2f9ed8b9c3f0
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@@ -1459,9 -1407,10 +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;
  }