diff options
| author | Krzysztof Hałasa <khalasa@piap.pl> | 2014-05-26 14:14:46 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2014-05-27 08:54:01 +0200 |
| commit | c7d37a66e345df2fdf1aa7b2c9a6d3d53846ca5b (patch) | |
| tree | f1973438062febd95c3013e1d58e01d7d197074c /net/mac80211 | |
| parent | 3bb20556726702a27166e49ef513bd8d8432d9c4 (diff) | |
| download | linux-c7d37a66e345df2fdf1aa7b2c9a6d3d53846ca5b.tar.gz linux-c7d37a66e345df2fdf1aa7b2c9a6d3d53846ca5b.tar.bz2 linux-c7d37a66e345df2fdf1aa7b2c9a6d3d53846ca5b.zip | |
mac80211: fix IBSS join by initializing last_scan_completed
Without this fix, freshly rebooted Linux creates a new IBSS
instead of joining an existing one. Only when jiffies counter
overflows after 5 minutes the IBSS can be successfully joined.
Signed-off-by: Krzysztof Hałasa <khalasa@piap.pl>
[edit commit message slightly]
Cc: stable@vger.kernel.org
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/ibss.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index 1bbac94da58d..18ee0a256b1e 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c @@ -1677,6 +1677,7 @@ int ieee80211_ibss_join(struct ieee80211_sub_if_data *sdata, sdata->u.ibss.control_port = params->control_port; sdata->u.ibss.userspace_handles_dfs = params->userspace_handles_dfs; sdata->u.ibss.basic_rates = params->basic_rates; + sdata->u.ibss.last_scan_completed = jiffies; /* fix basic_rates if channel does not support these rates */ rate_flags = ieee80211_chandef_rate_flags(¶ms->chandef); |