From 3768710b5d61082663949d8c685a3e8134b15c51 Mon Sep 17 00:00:00 2001
From: Javier Cardona <javier@cozybit.com>
Date: Wed, 9 Dec 2009 18:43:00 -0800
Subject: [PATCH] --- yaml --- r: 175556 b: refs/heads/master c:
 5d618cb81aeea19879975cd1f9a1e707694dfd7c h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/net/mac80211/rx.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d1603be5e6dc..2077046b6545 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c3cee72a403e3b4992a5478c9c33d668c246c22
+refs/heads/master: 5d618cb81aeea19879975cd1f9a1e707694dfd7c
diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c
index f237df408378..9f2807aeaf52 100644
--- a/trunk/net/mac80211/rx.c
+++ b/trunk/net/mac80211/rx.c
@@ -1712,7 +1712,6 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
 			mpp_path_add(proxied_addr, mpp_addr, sdata);
 		} else {
 			spin_lock_bh(&mppath->state_lock);
-			mppath->exp_time = jiffies;
 			if (compare_ether_addr(mppath->mpp, mpp_addr) != 0)
 				memcpy(mppath->mpp, mpp_addr, ETH_ALEN);
 			spin_unlock_bh(&mppath->state_lock);