summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/wl12xx/wl1271_cmd.c
diff options
context:
space:
mode:
authorJuuso Oikarinen <juuso.oikarinen@nokia.com>2010-03-26 13:53:25 +0300
committerJohn W. Linville <linville@tuxdriver.com>2010-03-31 22:39:15 +0400
commit60e84c2ebb7b04361cf1ba0d325cc93366bd04a6 (patch)
treebbe48b596b33bdb009cd8215b7d0e653b92d8425 /drivers/net/wireless/wl12xx/wl1271_cmd.c
parent5da11dcde3d2a91688e02f032062fa26877eacb0 (diff)
downloadlinux-60e84c2ebb7b04361cf1ba0d325cc93366bd04a6.tar.xz
wl1271: Update beacon interval properly for ad-hoc
Configure the hardware beacon interval to whatever requested by the mac80211. Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com> Reviewed-by: Teemu Paasikivi <ext-teemu.3.paasikivi@nokia.com> Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1271_cmd.c')
-rw-r--r--drivers/net/wireless/wl12xx/wl1271_cmd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_cmd.c b/drivers/net/wireless/wl12xx/wl1271_cmd.c
index 0aa2422982d3..0dcb3c2afe07 100644
--- a/drivers/net/wireless/wl12xx/wl1271_cmd.c
+++ b/drivers/net/wireless/wl12xx/wl1271_cmd.c
@@ -323,7 +323,7 @@ int wl1271_cmd_join(struct wl1271 *wl, u8 bss_type)
CONF_HW_BIT_RATE_24MBPS);
}
- join->beacon_interval = cpu_to_le16(WL1271_DEFAULT_BEACON_INT);
+ join->beacon_interval = cpu_to_le16(wl->beacon_int);
join->dtim_interval = WL1271_DEFAULT_DTIM_PERIOD;
join->channel = wl->channel;