[PATCH 3.11 085/128] mac80211: fix IBSS join by initializing last_scan_completed
Luis Henriques
luis.henriques at canonical.com
Thu Jul 24 09:45:34 UTC 2014
3.11.10.14 -stable review patch. If anyone has any objections, please let me know.
------------------
From: =?UTF-8?q?Krzysztof=20Ha=C5=82asa?= <khalasa at piap.pl>
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 at piap.pl>
[edit commit message slightly]
Signed-off-by: Johannes Berg <johannes.berg at intel.com>
[ luis: backported to 3.11: adjusted context ]
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
net/mac80211/ibss.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index 2d45643c964e..97a4b5b9d506 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -1055,6 +1055,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;
memcpy(sdata->vif.bss_conf.mcast_rate, params->mcast_rate,
sizeof(params->mcast_rate));
--
1.9.1
More information about the kernel-team
mailing list