aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/wl12xx/main.c')
-rw-r--r--drivers/net/wireless/wl12xx/main.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index 245544e6434c..a2aebac9fb82 100644
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -243,7 +243,8 @@ static void wl12xx_filter_work(struct work_struct *work)
243 if (ret < 0) 243 if (ret < 0)
244 goto out; 244 goto out;
245 245
246 ret = wl12xx_cmd_join(wl, wl->bss_type, 1, 100, 0); 246 /* FIXME: replace the magic numbers with proper definitions */
247 ret = wl->chip.op_cmd_join(wl, wl->bss_type, 1, 100, 0);
247 if (ret < 0) 248 if (ret < 0)
248 goto out_sleep; 249 goto out_sleep;
249 250
@@ -534,7 +535,7 @@ static int wl12xx_op_config(struct ieee80211_hw *hw, u32 changed)
534 535
535 if (channel != wl->channel) { 536 if (channel != wl->channel) {
536 /* FIXME: use beacon interval provided by mac80211 */ 537 /* FIXME: use beacon interval provided by mac80211 */
537 ret = wl12xx_cmd_join(wl, wl->bss_type, 1, 100, 0); 538 ret = wl->chip.op_cmd_join(wl, wl->bss_type, 1, 100, 0);
538 if (ret < 0) 539 if (ret < 0)
539 goto out_sleep; 540 goto out_sleep;
540 541
@@ -1082,7 +1083,7 @@ static void wl12xx_op_bss_info_changed(struct ieee80211_hw *hw,
1082 goto out; 1083 goto out;
1083 1084
1084 if (wl->bss_type != BSS_TYPE_IBSS) { 1085 if (wl->bss_type != BSS_TYPE_IBSS) {
1085 ret = wl12xx_cmd_join(wl, wl->bss_type, 5, 100, 1); 1086 ret = wl->chip.op_cmd_join(wl, wl->bss_type, 5, 100, 1);
1086 if (ret < 0) 1087 if (ret < 0)
1087 goto out; 1088 goto out;
1088 } 1089 }
@@ -1106,7 +1107,7 @@ static void wl12xx_op_bss_info_changed(struct ieee80211_hw *hw,
1106 if (ret < 0) 1107 if (ret < 0)
1107 goto out; 1108 goto out;
1108 1109
1109 ret = wl12xx_cmd_join(wl, wl->bss_type, 1, 100, 0); 1110 ret = wl->chip.op_cmd_join(wl, wl->bss_type, 1, 100, 0);
1110 1111
1111 if (ret < 0) 1112 if (ret < 0)
1112 goto out; 1113 goto out;