diff options
| author | Marek Lindner <lindner_marek@yahoo.de> | 2011-12-20 23:16:52 +0800 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-12-21 15:06:12 -0500 |
| commit | ec2b774e7c91094d8c00de579646f1162b87b01e (patch) | |
| tree | 29000f5c9ee2f2d51c71c392322970ac1f9955bc /net/mac80211 | |
| parent | eca107ff8a25e0528d6e6225ac6ce59bd498136f (diff) | |
| download | linux-3.10-ec2b774e7c91094d8c00de579646f1162b87b01e.tar.gz linux-3.10-ec2b774e7c91094d8c00de579646f1162b87b01e.tar.bz2 linux-3.10-ec2b774e7c91094d8c00de579646f1162b87b01e.zip | |
mac80211: ibss should not purge clients it is not responsible for
The IBSS merge code calls ieee80211_sta_expire() with a relatively
short expire timeout that purges other clients prematurely. The
expire function has to check that only the clients belonging to
the vif in question are purged.
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/sta_info.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index 3d01abb2b81..f0d3b483dab 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -946,6 +946,9 @@ void ieee80211_sta_expire(struct ieee80211_sub_if_data *sdata, mutex_lock(&local->sta_mtx); list_for_each_entry_safe(sta, tmp, &local->sta_list, list) + if (sdata != sta->sdata) + continue; + if (time_after(jiffies, sta->last_rx + exp_time)) { #ifdef CONFIG_MAC80211_IBSS_DEBUG printk(KERN_DEBUG "%s: expiring inactive STA %pM\n", |