]> git.hungrycats.org Git - linux/commitdiff
mac80211: fix IBSS join by initializing last_scan_completed
authorKrzysztof Hałasa <khalasa@piap.pl>
Mon, 26 May 2014 12:14:46 +0000 (14:14 +0200)
committerJiri Slaby <jslaby@suse.cz>
Thu, 17 Jul 2014 13:04:38 +0000 (15:04 +0200)
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>
net/mac80211/ibss.c

index a12afe77bb26b5037fe58d6624bbc87939c30cde..f69cac4bf39fccfc92b2b3280aa488420200cf43 100644 (file)
@@ -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(&params->chandef);