diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-09 20:17:24 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-09 20:17:24 +0100 |
| commit | f6d773cd4f3c18c40ab25a5cb92453756237840e (patch) | |
| tree | 5631a6ea4495ae2eb5058fb63b25dea3b197d61b /net/mac80211/ibss.c | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne... (diff) | |
| parent | mwl8k: use integral index instead of pointer for driver_data (diff) | |
| download | linux-f6d773cd4f3c18c40ab25a5cb92453756237840e.tar.xz linux-f6d773cd4f3c18c40ab25a5cb92453756237840e.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/ibss.c')
| -rw-r--r-- | net/mac80211/ibss.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index f1362f32c17d..fbffce90edbc 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c @@ -455,6 +455,10 @@ static void ieee80211_sta_merge_ibss(struct ieee80211_sub_if_data *sdata) ieee80211_sta_expire(sdata, IEEE80211_IBSS_INACTIVITY_LIMIT); + if (time_before(jiffies, ifibss->last_scan_completed + + IEEE80211_IBSS_MERGE_INTERVAL)) + return; + if (ieee80211_sta_active_ibss(sdata)) return; |