dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Kalle Valo 2009-08-07 13:34:05 +03:00 committed by John W. Linville
parent 0e71bb084a
commit 46e947b9c3
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/wl12xx/wl1251_cmd.c
View File

@ -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;

4
drivers/net/wireless/wl12xx/wl1251_cmd.h
View File

@ -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);

8
drivers/net/wireless/wl12xx/wl1251_main.c
View File

@ -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;