aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorKalle Valo <kalle.valo@nokia.com>2009-08-07 13:34:05 +0300
committerJohn W. Linville <linville@tuxdriver.com>2009-08-14 09:13:39 -0400
commit46e947b9c382f67f84cffec3bf068d6d23695058 (patch)
tree7cc889dfa4f3abf983f42c4bbeb9473edaed148f /drivers
parent0e71bb084adc4986b9a4be3581897f0ee703cbd5 (diff)
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')
-rw-r--r--drivers/net/wireless/wl12xx/wl1251_cmd.c4
-rw-r--r--drivers/net/wireless/wl12xx/wl1251_cmd.h4
-rw-r--r--drivers/net/wireless/wl12xx/wl1251_main.c8
3 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1251_cmd.c b/drivers/net/wireless/wl12xx/wl1251_cmd.c
index 53f5da65bcb..50daa9bda4a 100644
--- a/drivers/net/wireless/wl12xx/wl1251_cmd.c
+++ b/drivers/net/wireless/wl12xx/wl1251_cmd.c
@@ -251,8 +251,8 @@ out:
return ret;
}
-int wl1251_cmd_join(struct wl1251 *wl, u8 bss_type, u8 dtim_interval,
- u16 beacon_interval, u8 wait)
+int wl1251_cmd_join(struct wl1251 *wl, u8 bss_type, u16 beacon_interval,
+ u8 dtim_interval, bool wait)
{
unsigned long timeout;
struct cmd_join *join;
diff --git a/drivers/net/wireless/wl12xx/wl1251_cmd.h b/drivers/net/wireless/wl12xx/wl1251_cmd.h
index 64f228dd9a9..f9177d6941d 100644
--- a/drivers/net/wireless/wl12xx/wl1251_cmd.h
+++ b/drivers/net/wireless/wl12xx/wl1251_cmd.h
@@ -36,8 +36,8 @@ int wl1251_cmd_configure(struct wl1251 *wl, u16 id, void *buf, size_t len);
int wl1251_cmd_vbm(struct wl1251 *wl, u8 identity,
void *bitmap, u16 bitmap_len, u8 bitmap_control);
int wl1251_cmd_data_path(struct wl1251 *wl, u8 channel, bool enable);
-int wl1251_cmd_join(struct wl1251 *wl, u8 bss_type, u8 dtim_interval,
- u16 beacon_interval, u8 wait);
+int wl1251_cmd_join(struct wl1251 *wl, u8 bss_type, u16 beacon_interval,
+ u8 dtim_interval, bool wait);
int wl1251_cmd_ps_mode(struct wl1251 *wl, u8 ps_mode);
int wl1251_cmd_read_memory(struct wl1251 *wl, u32 addr, void *answer,
size_t len);
diff --git a/drivers/net/wireless/wl12xx/wl1251_main.c b/drivers/net/wireless/wl12xx/wl1251_main.c
index 8c88fe279ec..47b82faac69 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;