diff options
author | Kalle Valo <kalle.valo@nokia.com> | 2009-08-07 06:34:19 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-08-14 09:13:40 -0400 |
commit | 7a33732fd9f2181bfe639691ead3def7a1e87c7d (patch) | |
tree | 4fc307d7442fd64ed285615188569774d3b5e063 /drivers/net/wireless/wl12xx/wl1251_main.c | |
parent | e2fd4611d50a1cd13a370f84b672a5f29472ee09 (diff) |
wl1251: remove wait parameter from wl1251_cmd_join()
We should wait everytime for the join command to finish, not waiting for
it might create problems.
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.c | 8 |
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 701423345414..d03169266b29 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) | |||
325 | goto out; | 325 | goto out; |
326 | 326 | ||
327 | ret = wl1251_cmd_join(wl, wl->bss_type, wl->beacon_int, | 327 | ret = wl1251_cmd_join(wl, wl->bss_type, wl->beacon_int, |
328 | wl->dtim_period, false); | 328 | wl->dtim_period); |
329 | if (ret < 0) | 329 | if (ret < 0) |
330 | goto out_sleep; | 330 | goto out_sleep; |
331 | 331 | ||
@@ -565,7 +565,7 @@ static int wl1251_op_config(struct ieee80211_hw *hw, u32 changed) | |||
565 | 565 | ||
566 | if (channel != wl->channel) { | 566 | if (channel != wl->channel) { |
567 | ret = wl1251_cmd_join(wl, wl->bss_type, wl->beacon_int, | 567 | ret = wl1251_cmd_join(wl, wl->bss_type, wl->beacon_int, |
568 | wl->dtim_period, false); | 568 | wl->dtim_period); |
569 | if (ret < 0) | 569 | if (ret < 0) |
570 | goto out_sleep; | 570 | goto out_sleep; |
571 | 571 | ||
@@ -1124,7 +1124,7 @@ static void wl1251_op_bss_info_changed(struct ieee80211_hw *hw, | |||
1124 | if (wl->bss_type != BSS_TYPE_IBSS) { | 1124 | if (wl->bss_type != BSS_TYPE_IBSS) { |
1125 | ret = wl1251_cmd_join(wl, wl->bss_type, | 1125 | ret = wl1251_cmd_join(wl, wl->bss_type, |
1126 | wl->beacon_int, | 1126 | wl->beacon_int, |
1127 | wl->dtim_period, true); | 1127 | wl->dtim_period); |
1128 | if (ret < 0) | 1128 | if (ret < 0) |
1129 | goto out_sleep; | 1129 | goto out_sleep; |
1130 | wl1251_warning("Set ctsprotect failed %d", ret); | 1130 | wl1251_warning("Set ctsprotect failed %d", ret); |
@@ -1151,7 +1151,7 @@ static void wl1251_op_bss_info_changed(struct ieee80211_hw *hw, | |||
1151 | goto out; | 1151 | goto out; |
1152 | 1152 | ||
1153 | ret = wl1251_cmd_join(wl, wl->bss_type, wl->beacon_int, | 1153 | ret = wl1251_cmd_join(wl, wl->bss_type, wl->beacon_int, |
1154 | wl->dtim_period, false); | 1154 | wl->dtim_period); |
1155 | 1155 | ||
1156 | if (ret < 0) | 1156 | if (ret < 0) |
1157 | goto out; | 1157 | goto out; |