wl1251: create wl1251_join()

Better to use wl1251_cmd_join() only for sending the command and move
the logic to wl1251_join().

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>

1 files changed, 0 insertions, 17 deletions

diff --git a/drivers/net/wireless/wl12xx/wl1251_cmd.c b/drivers/net/wireless/wl12xx/wl1251_cmd.c
index 4e796db16244..d7800a39f7d4 100644
--- a/drivers/net/wireless/wl12xx/wl1251_cmd.c
+++ b/drivers/net/wireless/wl12xx/wl1251_cmd.c
@@ -254,7 +254,6 @@ out:
 int wl1251_cmd_join(struct wl1251 *wl, u8 bss_type, u8 channel,
                     u16 beacon_interval, u8 dtim_interval)
 {
-        unsigned long timeout;
         struct cmd_join *join;
         int ret, i;
         u8 *bssid;
@@ -265,14 +264,6 @@ int wl1251_cmd_join(struct wl1251 *wl, u8 bss_type, u8 channel,
                 goto out;
         }
 
-        /* FIXME: this should be in main.c */
-        ret = wl1251_acx_frame_rates(wl, DEFAULT_HW_GEN_TX_RATE,
-                                     DEFAULT_HW_GEN_MODULATION_TYPE,
-                                     wl->tx_mgmt_frm_rate,
-                                     wl->tx_mgmt_frm_mod);
-        if (ret < 0)
-                goto out;
-
         wl1251_debug(DEBUG_CMD, "cmd join%s ch %d %d/%d",
                      bss_type == BSS_TYPE_IBSS ? " ibss" : "",
                      channel, beacon_interval, dtim_interval);
@@ -300,14 +291,6 @@ int wl1251_cmd_join(struct wl1251 *wl, u8 bss_type, u8 channel,
                 goto out;
         }
 
-        timeout = msecs_to_jiffies(JOIN_TIMEOUT);
-
-        /*
-         * ugly hack: we should wait for JOIN_EVENT_COMPLETE_ID but to
-         * simplify locking we just sleep instead, for now
-         */
-        msleep(10);
-
 out:
         kfree(join);
         return ret;