wl1271: Add config structure for TX path parameters
[linux-2.6.git] / drivers / net / wireless / wl12xx / wl1271_init.c
index e45af075e67140fbc92dfa8f818fb04b6e5aa769..a3fc4c97c518921a129bd8ea4e5b1ba82eee3b1c 100644 (file)
@@ -94,7 +94,7 @@ static int wl1271_init_rx_config(struct wl1271 *wl, u32 config, u32 filter)
 {
        int ret;
 
-       ret = wl1271_acx_rx_msdu_life_time(wl, RX_MSDU_LIFETIME_DEF);
+       ret = wl1271_acx_rx_msdu_life_time(wl);
        if (ret < 0)
                return ret;
 
@@ -125,7 +125,7 @@ static int wl1271_init_phy_config(struct wl1271 *wl)
        if (ret < 0)
                return ret;
 
-       ret = wl1271_acx_rts_threshold(wl, RTS_THRESHOLD_DEF);
+       ret = wl1271_acx_rts_threshold(wl, wl->conf.rx.rts_threshold);
        if (ret < 0)
                return ret;
 
@@ -196,7 +196,14 @@ static int wl1271_init_general_parms(struct wl1271 *wl)
 
        gen_parms->id = TEST_CMD_INI_FILE_GENERAL_PARAM;
 
-       gen_parms->ref_clk = REF_CLK_38_4_E;
+       /*
+        * FIXME: The firmware crashes on boot with REF_CLK_38_4_E as clock.
+        *        according to TI engineers, ref clk 5 is an unofficial
+        *        38.4 XTAL clock config, which seems to boot the device.
+        *        Restore correct value once the real problem source is
+        *        identified.
+        */
+       gen_parms->ref_clk = 5; /* REF_CLK_38_4_E; */
        /* FIXME: magic numbers */
        gen_parms->settling_time = 5;
        gen_parms->clk_valid_on_wakeup = 0;
@@ -375,7 +382,7 @@ int wl1271_hw_init(struct wl1271 *wl)
                goto out_free_memmap;
 
        /* Configure TX rate classes */
-       ret = wl1271_acx_rate_policies(wl, ACX_RATE_MASK_ALL);
+       ret = wl1271_acx_rate_policies(wl, CONF_TX_RATE_MASK_ALL);
        if (ret < 0)
                goto out_free_memmap;