summaryrefslogtreecommitdiff
path: root/net/mac80211
diff options
context:
space:
mode:
authorKrzysztof Hałasa <khalasa@piap.pl>2014-05-26 14:14:46 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-07-09 11:21:28 -0700
commit894793a948a9350951abc9bd190210d92e81814b (patch)
tree6598f93784c45c542ac5e0511ab1a3913aa7839c /net/mac80211
parent4ee1b94b90354155525b3f95f26c29cd42516982 (diff)
downloadlwn-894793a948a9350951abc9bd190210d92e81814b.tar.gz
lwn-894793a948a9350951abc9bd190210d92e81814b.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/mac80211')
-rw-r--r--net/mac80211/ibss.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index 06d28787945b..53cf876b97b2 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -1648,6 +1648,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(&params->chandef);