diff options
| author | Krzysztof Hałasa <khalasa@piap.pl> | 2014-05-26 14:14:46 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-09 11:18:26 -0700 |
| commit | 48e805c8a9abd72f9990c8a1778e28a42156a82e (patch) | |
| tree | dac422a462aa9ab5800b5859c78738bff2d5458b /net | |
| parent | f4e368a53c65f8acd462b2b038c18a21d30eaeb8 (diff) | |
| download | linux-stable-48e805c8a9abd72f9990c8a1778e28a42156a82e.tar.gz linux-stable-48e805c8a9abd72f9990c8a1778e28a42156a82e.tar.bz2 linux-stable-48e805c8a9abd72f9990c8a1778e28a42156a82e.zip | |
mac80211: fix IBSS join by initializing last_scan_completed
commit c7d37a66e345df2fdf1aa7b2c9a6d3d53846ca5b upstream.
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]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -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 2796a198728f..ea7013cb7e52 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c @@ -1655,6 +1655,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); |