diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-11 14:19:31 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-11 14:19:31 -0800 |
| commit | ba2dca91f000e4796c23d14834680dd90528842f (patch) | |
| tree | fd27c7383f779c1276bed7a1ddaea81efc4395a2 /net/mac80211/rx.c | |
| parent | c557c15d83ea16e6c1a043c8eccb0f60bb19cb96 (diff) | |
| parent | 65182b9fb004220f250d4269c864cf0f1f372e85 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211/rx.c')
| -rw-r--r-- | net/mac80211/rx.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index f237df40837..9f2807aeaf5 100644 --- a/net/mac80211/rx.c +++ b/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); |