diff options
| author | Krzysztof Hałasa <khalasa@piap.pl> | 2014-05-26 14:14:46 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2014-07-11 13:33:37 +0100 |
| commit | a398e4147fac72299569e5e0bf4bf3d83b914cb1 (patch) | |
| tree | 8bc6d5735c4fb18d4378fe3aca775e867531d3ca | |
| parent | c742f9ad85e6a133d79b14fbbd10e6cd2e0aea28 (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>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -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 9e20cb82077..1c018d100fc 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c @@ -914,6 +914,7 @@ int ieee80211_ibss_join(struct ieee80211_sub_if_data *sdata, sdata->u.ibss.privacy = params->privacy; sdata->u.ibss.basic_rates = params->basic_rates; + sdata->u.ibss.last_scan_completed = jiffies; memcpy(sdata->vif.bss_conf.mcast_rate, params->mcast_rate, sizeof(params->mcast_rate)); |