Commit 46e947b9 authored by Kalle Valo's avatar Kalle Valo Committed by John W. Linville
Browse files

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: default avatarKalle Valo <kalle.valo@nokia.com>
Reviewed-by: default avatarVidhya Govindan <vidhya.govindan@nokia.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 0e71bb08
...@@ -251,8 +251,8 @@ out: ...@@ -251,8 +251,8 @@ out:
return ret; return ret;
} }
int wl1251_cmd_join(struct wl1251 *wl, u8 bss_type, u8 dtim_interval, int wl1251_cmd_join(struct wl1251 *wl, u8 bss_type, u16 beacon_interval,
u16 beacon_interval, u8 wait) u8 dtim_interval, bool wait)
{ {
unsigned long timeout; unsigned long timeout;
struct cmd_join *join; struct cmd_join *join;
......
...@@ -36,8 +36,8 @@ int wl1251_cmd_configure(struct wl1251 *wl, u16 id, void *buf, size_t len); ...@@ -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, int wl1251_cmd_vbm(struct wl1251 *wl, u8 identity,
void *bitmap, u16 bitmap_len, u8 bitmap_control); void *bitmap, u16 bitmap_len, u8 bitmap_control);
int wl1251_cmd_data_path(struct wl1251 *wl, u8 channel, bool enable); 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, int wl1251_cmd_join(struct wl1251 *wl, u8 bss_type, u16 beacon_interval,
u16 beacon_interval, u8 wait); u8 dtim_interval, bool wait);
int wl1251_cmd_ps_mode(struct wl1251 *wl, u8 ps_mode); int wl1251_cmd_ps_mode(struct wl1251 *wl, u8 ps_mode);
int wl1251_cmd_read_memory(struct wl1251 *wl, u32 addr, void *answer, int wl1251_cmd_read_memory(struct wl1251 *wl, u32 addr, void *answer,
size_t len); size_t len);
......
...@@ -325,7 +325,7 @@ static void wl1251_filter_work(struct work_struct *work) ...@@ -325,7 +325,7 @@ static void wl1251_filter_work(struct work_struct *work)
goto out; goto out;
/* FIXME: replace the magic numbers with proper definitions */ /* 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) if (ret < 0)
goto out_sleep; goto out_sleep;
...@@ -565,7 +565,7 @@ static int wl1251_op_config(struct ieee80211_hw *hw, u32 changed) ...@@ -565,7 +565,7 @@ static int wl1251_op_config(struct ieee80211_hw *hw, u32 changed)
if (channel != wl->channel) { if (channel != wl->channel) {
/* FIXME: use beacon interval provided by mac80211 */ /* 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) if (ret < 0)
goto out_sleep; goto out_sleep;
...@@ -1113,7 +1113,7 @@ static void wl1251_op_bss_info_changed(struct ieee80211_hw *hw, ...@@ -1113,7 +1113,7 @@ static void wl1251_op_bss_info_changed(struct ieee80211_hw *hw,
goto out; goto out;
if (wl->bss_type != BSS_TYPE_IBSS) { 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) if (ret < 0)
goto out_sleep; goto out_sleep;
wl1251_warning("Set ctsprotect failed %d", ret); wl1251_warning("Set ctsprotect failed %d", ret);
...@@ -1139,7 +1139,7 @@ static void wl1251_op_bss_info_changed(struct ieee80211_hw *hw, ...@@ -1139,7 +1139,7 @@ static void wl1251_op_bss_info_changed(struct ieee80211_hw *hw,
if (ret < 0) if (ret < 0)
goto out; 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) if (ret < 0)
goto out; goto out;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment