Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

Conflicts:
	drivers/net/wireless/wl12xx/wl1271_cmd.h

1 files changed, 4 insertions, 244 deletions

diff --git a/drivers/net/wireless/wl12xx/wl1271_cmd.c b/drivers/net/wireless/wl12xx/wl1271_cmd.c
index 530678e45a13..ce503ddd5a41 100644
--- a/drivers/net/wireless/wl12xx/wl1271_cmd.c
+++ b/drivers/net/wireless/wl12xx/wl1271_cmd.c
@@ -104,100 +104,6 @@ out:
         return ret;
 }
 
-static int wl1271_cmd_cal_channel_tune(struct wl1271 *wl)
-{
-        struct wl1271_cmd_cal_channel_tune *cmd;
-        int ret = 0;
-
-        cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);
-        if (!cmd)
-                return -ENOMEM;
-
-        cmd->test.id = TEST_CMD_CHANNEL_TUNE;
-
-        cmd->band = WL1271_CHANNEL_TUNE_BAND_2_4;
-        /* set up any channel, 7 is in the middle of the range */
-        cmd->channel = 7;
-
-        ret = wl1271_cmd_test(wl, cmd, sizeof(*cmd), 0);
-        if (ret < 0)
-                wl1271_warning("TEST_CMD_CHANNEL_TUNE failed");
-
-        kfree(cmd);
-        return ret;
-}
-
-static int wl1271_cmd_cal_update_ref_point(struct wl1271 *wl)
-{
-        struct wl1271_cmd_cal_update_ref_point *cmd;
-        int ret = 0;
-
-        cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);
-        if (!cmd)
-                return -ENOMEM;
-
-        cmd->test.id = TEST_CMD_UPDATE_PD_REFERENCE_POINT;
-
-        /* FIXME: still waiting for the correct values */
-        cmd->ref_power    = 0;
-        cmd->ref_detector = 0;
-
-        cmd->sub_band     = WL1271_PD_REFERENCE_POINT_BAND_B_G;
-
-        ret = wl1271_cmd_test(wl, cmd, sizeof(*cmd), 0);
-        if (ret < 0)
-                wl1271_warning("TEST_CMD_UPDATE_PD_REFERENCE_POINT failed");
-
-        kfree(cmd);
-        return ret;
-}
-
-static int wl1271_cmd_cal_p2g(struct wl1271 *wl)
-{
-        struct wl1271_cmd_cal_p2g *cmd;
-        int ret = 0;
-
-        cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);
-        if (!cmd)
-                return -ENOMEM;
-
-        cmd->test.id = TEST_CMD_P2G_CAL;
-
-        cmd->sub_band_mask = WL1271_CAL_P2G_BAND_B_G;
-
-        ret = wl1271_cmd_test(wl, cmd, sizeof(*cmd), 0);
-        if (ret < 0)
-                wl1271_warning("TEST_CMD_P2G_CAL failed");
-
-        kfree(cmd);
-        return ret;
-}
-
-static int wl1271_cmd_cal(struct wl1271 *wl)
-{
-        /*
-         * FIXME: we must make sure that we're not sleeping when calibration
-         * is done
-         */
-        int ret;
-
-        wl1271_notice("performing tx calibration");
-
-        ret = wl1271_cmd_cal_channel_tune(wl);
-        if (ret < 0)
-                return ret;
-
-        ret = wl1271_cmd_cal_update_ref_point(wl);
-        if (ret < 0)
-                return ret;
-
-        ret = wl1271_cmd_cal_p2g(wl);
-        if (ret < 0)
-                return ret;
-
-        return ret;
-}
-
 int wl1271_cmd_general_parms(struct wl1271 *wl)
 {
         struct wl1271_general_parms_cmd *gen_parms;
@@ -226,7 +132,7 @@ int wl1271_cmd_general_parms(struct wl1271 *wl)
 int wl1271_cmd_radio_parms(struct wl1271 *wl)
 {
         struct wl1271_radio_parms_cmd *radio_parms;
-        struct conf_radio_parms *rparam = &wl->conf.init.radioparam;
+        struct wl1271_ini_general_params *gp = &wl->nvs->general_params;
         int ret;
 
         if (!wl->nvs)
@@ -242,7 +148,7 @@ int wl1271_cmd_radio_parms(struct wl1271 *wl)
         memcpy(&radio_parms->static_params_2, &wl->nvs->stat_radio_params_2,
                sizeof(struct wl1271_ini_band_params_2));
         memcpy(&radio_parms->dyn_params_2,
-               &wl->nvs->dyn_radio_params_2[rparam->fem].params,
+               &wl->nvs->dyn_radio_params_2[gp->tx_bip_fem_manufacturer].params,
                sizeof(struct wl1271_ini_fem_params_2));
 
         /* 5GHz parameters */
@@ -250,7 +156,7 @@ int wl1271_cmd_radio_parms(struct wl1271 *wl)
                &wl->nvs->stat_radio_params_5,
                sizeof(struct wl1271_ini_band_params_5));
         memcpy(&radio_parms->dyn_params_5,
-               &wl->nvs->dyn_radio_params_5[rparam->fem].params,
+               &wl->nvs->dyn_radio_params_5[gp->tx_bip_fem_manufacturer].params,
                sizeof(struct wl1271_ini_fem_params_5));
 
         wl1271_dump(DEBUG_CMD, "TEST_CMD_INI_FILE_RADIO_PARAM: ",
@@ -295,20 +201,10 @@ static int wl1271_cmd_wait_for_event(struct wl1271 *wl, u32 mask)
 
 int wl1271_cmd_join(struct wl1271 *wl, u8 bss_type)
 {
-        static bool do_cal = true;
         struct wl1271_cmd_join *join;
         int ret, i;
         u8 *bssid;
 
-        /* FIXME: remove when we get calibration from the factory */
-        if (do_cal) {
-                ret = wl1271_cmd_cal(wl);
-                if (ret < 0)
-                        wl1271_warning("couldn't calibrate");
-                else
-                        do_cal = false;
-        }
-
         join = kzalloc(sizeof(*join), GFP_KERNEL);
         if (!join) {
                 ret = -ENOMEM;
@@ -567,142 +463,6 @@ out:
         return ret;
 }
 
-int wl1271_cmd_scan(struct wl1271 *wl, const u8 *ssid, size_t ssid_len,
-                    struct cfg80211_scan_request *req, u8 active_scan,
-                    u8 high_prio, u8 band, u8 probe_requests)
-{
-
-        struct wl1271_cmd_trigger_scan_to *trigger = NULL;
-        struct wl1271_cmd_scan *params = NULL;
-        struct ieee80211_channel *channels;
-        u32 rate;
-        int i, j, n_ch, ret;
-        u16 scan_options = 0;
-        u8 ieee_band;
-
-        if (band == WL1271_SCAN_BAND_2_4_GHZ) {
-                ieee_band = IEEE80211_BAND_2GHZ;
-                rate = wl->conf.tx.basic_rate;
-        } else if (band == WL1271_SCAN_BAND_DUAL && wl1271_11a_enabled()) {
-                ieee_band = IEEE80211_BAND_2GHZ;
-                rate = wl->conf.tx.basic_rate;
-        } else if (band == WL1271_SCAN_BAND_5_GHZ && wl1271_11a_enabled()) {
-                ieee_band = IEEE80211_BAND_5GHZ;
-                rate = wl->conf.tx.basic_rate_5;
-        } else
-                return -EINVAL;
-
-        if (wl->hw->wiphy->bands[ieee_band]->channels == NULL)
-                return -EINVAL;
-
-        channels = wl->hw->wiphy->bands[ieee_band]->channels;
-        n_ch = wl->hw->wiphy->bands[ieee_band]->n_channels;
-
-        if (test_bit(WL1271_FLAG_SCANNING, &wl->flags))
-                return -EINVAL;
-
-        params = kzalloc(sizeof(*params), GFP_KERNEL);
-        if (!params)
-                return -ENOMEM;
-
-        params->params.rx_config_options = cpu_to_le32(CFG_RX_ALL_GOOD);
-        params->params.rx_filter_options =
-                cpu_to_le32(CFG_RX_PRSP_EN | CFG_RX_MGMT_EN | CFG_RX_BCN_EN);
-
-        if (!active_scan)
-                scan_options |= WL1271_SCAN_OPT_PASSIVE;
-        if (high_prio)
-                scan_options |= WL1271_SCAN_OPT_PRIORITY_HIGH;
-        params->params.scan_options = cpu_to_le16(scan_options);
-
-        params->params.num_probe_requests = probe_requests;
-        params->params.tx_rate = cpu_to_le32(rate);
-        params->params.tid_trigger = 0;
-        params->params.scan_tag = WL1271_SCAN_DEFAULT_TAG;
-
-        if (band == WL1271_SCAN_BAND_DUAL)
-                params->params.band = WL1271_SCAN_BAND_2_4_GHZ;
-        else
-                params->params.band = band;
-
-        for (i = 0, j = 0; i < n_ch && i < WL1271_SCAN_MAX_CHANNELS; i++) {
-                if (!(channels[i].flags & IEEE80211_CHAN_DISABLED)) {
-                        params->channels[j].min_duration =
-                                cpu_to_le32(WL1271_SCAN_CHAN_MIN_DURATION);
-                        params->channels[j].max_duration =
-                                cpu_to_le32(WL1271_SCAN_CHAN_MAX_DURATION);
-                        memset(&params->channels[j].bssid_lsb, 0xff, 4);
-                        memset(&params->channels[j].bssid_msb, 0xff, 2);
-                        params->channels[j].early_termination = 0;
-                        params->channels[j].tx_power_att =
-                                WL1271_SCAN_CURRENT_TX_PWR;
-                        params->channels[j].channel = channels[i].hw_value;
-                        j++;
-                }
-        }
-
-        params->params.num_channels = j;
-
-        if (ssid_len && ssid) {
-                params->params.ssid_len = ssid_len;
-                memcpy(params->params.ssid, ssid, ssid_len);
-        }
-
-        ret = wl1271_cmd_build_probe_req(wl, ssid, ssid_len,
-                                         req->ie, req->ie_len, ieee_band);
-        if (ret < 0) {
-                wl1271_error("PROBE request template failed");
-                goto out;
-        }
-
-        trigger = kzalloc(sizeof(*trigger), GFP_KERNEL);
-        if (!trigger) {
-                ret = -ENOMEM;
-                goto out;
-        }
-
-        /* disable the timeout */
-        trigger->timeout = 0;
-
-        ret = wl1271_cmd_send(wl, CMD_TRIGGER_SCAN_TO, trigger,
-                              sizeof(*trigger), 0);
-        if (ret < 0) {
-                wl1271_error("trigger scan to failed for hw scan");
-                goto out;
-        }
-
-        wl1271_dump(DEBUG_SCAN, "SCAN: ", params, sizeof(*params));
-
-        set_bit(WL1271_FLAG_SCANNING, &wl->flags);
-        if (wl1271_11a_enabled()) {
-                wl->scan.state = band;
-                if (band == WL1271_SCAN_BAND_DUAL) {
-                        wl->scan.active = active_scan;
-                        wl->scan.high_prio = high_prio;
-                        wl->scan.probe_requests = probe_requests;
-                        if (ssid_len && ssid) {
-                                wl->scan.ssid_len = ssid_len;
-                                memcpy(wl->scan.ssid, ssid, ssid_len);
-                        } else
-                                wl->scan.ssid_len = 0;
-                        wl->scan.req = req;
-                } else
-                        wl->scan.req = NULL;
-        }
-
-        ret = wl1271_cmd_send(wl, CMD_SCAN, params, sizeof(*params), 0);
-        if (ret < 0) {
-                wl1271_error("SCAN failed");
-                clear_bit(WL1271_FLAG_SCANNING, &wl->flags);
-                goto out;
-        }
-
-out:
-        kfree(params);
-        kfree(trigger);
-        return ret;
-}
-
 int wl1271_cmd_template_set(struct wl1271 *wl, u16 template_id,
                             void *buf, size_t buf_len, int index, u32 rates)
 {
@@ -807,7 +567,7 @@ int wl1271_cmd_build_ps_poll(struct wl1271 *wl, u16 aid)
                 goto out;
 
         ret = wl1271_cmd_template_set(wl, CMD_TEMPL_PS_POLL, skb->data,
-                                      skb->len, 0, wl->basic_rate);
+                                      skb->len, 0, wl->basic_rate_set);
 
 out:
         dev_kfree_skb(skb);