---

yaml --- r: 291288 b: refs/heads/master c: 6667776 h: refs/heads/master v: v3
git-mirror · Mar 5, 2012 · ccbc1b2 · ccbc1b2
1 parent 3b3f976
commit ccbc1b2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97fd311a2615d8f35e796b11a14b6cf3d335d423
+refs/heads/master: 6667776d3cf32dd3809a18917c2b7adb8ef12aa2
diff --git a/trunk/drivers/net/wireless/wl12xx/main.c b/trunk/drivers/net/wireless/wl12xx/main.c
@@ -3723,6 +3723,7 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl,
 			u32 rates;
 			int ieoffset;
 			wlvif->aid = bss_conf->aid;
+			wlvif->beacon_int = bss_conf->beacon_int;
 			set_assoc = true;
 
 			/*