diff options
| author | John W. Linville <linville@tuxdriver.com> | 2009-12-28 15:09:11 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-12-28 15:09:11 -0500 |
| commit | ea1e4b842049fcc4741096538114871a74859314 (patch) | |
| tree | c2336ab480ac0fd62e0dc41b391d99c97158dc9c /net/mac80211/rx.c | |
| parent | b6ce5c33001b1dc83e6a1a6f30c5dccccea651b6 (diff) | |
| parent | 92c6f8d849178582fc527aaf1e51dd37a74767d3 (diff) | |
Merge 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 a182e423109b..6cbf1a7b3157 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c | |||
| @@ -1631,7 +1631,6 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx) | |||
| 1631 | mpp_path_add(proxied_addr, mpp_addr, sdata); | 1631 | mpp_path_add(proxied_addr, mpp_addr, sdata); |
| 1632 | } else { | 1632 | } else { |
| 1633 | spin_lock_bh(&mppath->state_lock); | 1633 | spin_lock_bh(&mppath->state_lock); |
| 1634 | mppath->exp_time = jiffies; | ||
| 1635 | if (compare_ether_addr(mppath->mpp, mpp_addr) != 0) | 1634 | if (compare_ether_addr(mppath->mpp, mpp_addr) != 0) |
| 1636 | memcpy(mppath->mpp, mpp_addr, ETH_ALEN); | 1635 | memcpy(mppath->mpp, mpp_addr, ETH_ALEN); |
| 1637 | spin_unlock_bh(&mppath->state_lock); | 1636 | spin_unlock_bh(&mppath->state_lock); |