diff options
author | Krzysztof Hałasa <khalasa@piap.pl> | 2014-05-26 14:14:46 +0200 |
---|---|---|
committer | Jiri Slaby <jslaby@suse.cz> | 2014-07-17 15:04:38 +0200 |
commit | 8b623dad986de9a560cae3f61a2be21180f10add (patch) | |
tree | f3018ff479158c9d9e5ac51c265e0f6027722488 | |
parent | d9f8ab9c7c5e29b630816bd2be3d9c90c98c75ba (diff) |
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: Jiri Slaby <jslaby@suse.cz>
-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 a12afe77bb2..f69cac4bf39 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c @@ -1203,6 +1203,7 @@ int ieee80211_ibss_join(struct ieee80211_sub_if_data *sdata, sdata->u.ibss.privacy = params->privacy; sdata->u.ibss.control_port = params->control_port; 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); |