From ccbc1b279ebcec24085f2557efe593bf3c287695 Mon Sep 17 00:00:00 2001 From: Eliad Peller Date: Sun, 4 Mar 2012 10:55:53 +0200 Subject: [PATCH] --- yaml --- r: 291288 b: refs/heads/master c: 6667776d3cf32dd3809a18917c2b7adb8ef12aa2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/wl12xx/main.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index de6fc5e977dc..d17e25c1a9c7 100644 --- 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 index 1d5f2d5614fb..89bf9eadc840 100644 --- 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; /*