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);