aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx/wl1251_cmd.c
diff options
context:
space:
mode:
authorKalle Valo <kalle.valo@nokia.com>2009-08-07 13:34:12 +0300
committerJohn W. Linville <linville@tuxdriver.com>2009-08-14 09:13:39 -0400
commite2fd4611d50a1cd13a370f84b672a5f29472ee09 (patch)
tree2195d420e6cbdc73acbbd3be182aa56aa4c0484c /drivers/net/wireless/wl12xx/wl1251_cmd.c
parent46e947b9c382f67f84cffec3bf068d6d23695058 (diff)
downloadkernel_samsung_aries-e2fd4611d50a1cd13a370f84b672a5f29472ee09.zip
kernel_samsung_aries-e2fd4611d50a1cd13a370f84b672a5f29472ee09.tar.gz
kernel_samsung_aries-e2fd4611d50a1cd13a370f84b672a5f29472ee09.tar.bz2
wl1251: use beacon interval and dtim period provided by mac80211
wl1251 was using hardcoded beacon intervals and dtim periods, use the ones provided by mac80211 instead. Signed-off-by: Kalle Valo <kalle.valo@nokia.com> Reviewed-by: Vidhya Govindan <vidhya.govindan@nokia.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1251_cmd.c')
-rw-r--r--drivers/net/wireless/wl12xx/wl1251_cmd.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1251_cmd.c b/drivers/net/wireless/wl12xx/wl1251_cmd.c
index 50daa9b..9cd46ce 100644
--- a/drivers/net/wireless/wl12xx/wl1251_cmd.c
+++ b/drivers/net/wireless/wl12xx/wl1251_cmd.c
@@ -273,7 +273,10 @@ int wl1251_cmd_join(struct wl1251 *wl, u8 bss_type, u16 beacon_interval,
if (ret < 0)
goto out;
- wl1251_debug(DEBUG_CMD, "cmd join");
+ wl1251_debug(DEBUG_CMD, "cmd join%s %d %d%s",
+ bss_type == BSS_TYPE_IBSS ? " ibss" : "",
+ beacon_interval, dtim_interval,
+ wait ? " wait" : "");
/* Reverse order BSSID */
bssid = (u8 *) &join->bssid_lsb;