summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/wl12xx/wl1251_main.c
diff options
context:
space:
mode:
authorKalle Valo <kalle.valo@nokia.com>2009-08-07 10:34:05 (GMT)
committerJohn W. Linville <linville@tuxdriver.com>2009-08-14 13:13:39 (GMT)
commit46e947b9c382f67f84cffec3bf068d6d23695058 (patch)
tree7cc889dfa4f3abf983f42c4bbeb9473edaed148f /drivers/net/wireless/wl12xx/wl1251_main.c
parent0e71bb084adc4986b9a4be3581897f0ee703cbd5 (diff)
downloadlinux-fsl-qoriq-46e947b9c382f67f84cffec3bf068d6d23695058.tar.xz
wl1251: reorder wl1251_cmd_join() arguments
It's more common to have beacon interval before dtim period. Also use bool instead of u8. 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_main.c')
-rw-r--r--drivers/net/wireless/wl12xx/wl1251_main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1251_main.c b/drivers/net/wireless/wl12xx/wl1251_main.c
index 8c88fe2..47b82fa 100644
--- a/drivers/net/wireless/wl12xx/wl1251_main.c
+++ b/drivers/net/wireless/wl12xx/wl1251_main.c
@@ -325,7 +325,7 @@ static void wl1251_filter_work(struct work_struct *work)
goto out;
/* FIXME: replace the magic numbers with proper definitions */
- ret = wl1251_cmd_join(wl, wl->bss_type, 1, 100, 0);
+ ret = wl1251_cmd_join(wl, wl->bss_type, 100, 1, false);
if (ret < 0)
goto out_sleep;
@@ -565,7 +565,7 @@ static int wl1251_op_config(struct ieee80211_hw *hw, u32 changed)
if (channel != wl->channel) {
/* FIXME: use beacon interval provided by mac80211 */
- ret = wl1251_cmd_join(wl, wl->bss_type, 1, 100, 0);
+ ret = wl1251_cmd_join(wl, wl->bss_type, 100, 1, false);
if (ret < 0)
goto out_sleep;
@@ -1113,7 +1113,7 @@ static void wl1251_op_bss_info_changed(struct ieee80211_hw *hw,
goto out;
if (wl->bss_type != BSS_TYPE_IBSS) {
- ret = wl1251_cmd_join(wl, wl->bss_type, 5, 100, 1);
+ ret = wl1251_cmd_join(wl, wl->bss_type, 100, 5, true);
if (ret < 0)
goto out_sleep;
wl1251_warning("Set ctsprotect failed %d", ret);
@@ -1139,7 +1139,7 @@ static void wl1251_op_bss_info_changed(struct ieee80211_hw *hw,
if (ret < 0)
goto out;
- ret = wl1251_cmd_join(wl, wl->bss_type, 1, 100, 0);
+ ret = wl1251_cmd_join(wl, wl->bss_type, 100, 1, false);
if (ret < 0)
goto out;