Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[karo-tx-linux.git] / drivers / net / wireless / ti / wl18xx / scan.c

diff --git a/drivers/net/wireless/ti/wl18xx/scan.c b/drivers/net/wireless/ti/wl18xx/scan.c
index c938c494c785703b6f3b4a6a1fed48530028627c..bc15aa2c3efad73582de0fab4a98f6836280272c 100644 (file)
--- a/drivers/net/wireless/ti/wl18xx/scan.c
+++ b/drivers/net/wireless/ti/wl18xx/scan.c
@@ -228,13 +228,15 @@ int wl18xx_scan_sched_scan_config(struct wl1271 *wl,
        wl18xx_adjust_channels(cmd, cmd_channels);
 
        if (c->num_short_intervals && c->long_interval &&
-           c->long_interval > req->interval) {
-               cmd->short_cycles_msec = cpu_to_le16(req->interval);
+           c->long_interval > req->scan_plans[0].interval * MSEC_PER_SEC) {
+               cmd->short_cycles_msec =
+                       cpu_to_le16(req->scan_plans[0].interval * MSEC_PER_SEC);
                cmd->long_cycles_msec = cpu_to_le16(c->long_interval);
                cmd->short_cycles_count = c->num_short_intervals;
        } else {
                cmd->short_cycles_msec = 0;
-               cmd->long_cycles_msec = cpu_to_le16(req->interval);
+               cmd->long_cycles_msec =
+                       cpu_to_le16(req->scan_plans[0].interval * MSEC_PER_SEC);
                cmd->short_cycles_count = 0;
        }
        wl1271_debug(DEBUG_SCAN, "short_interval: %d, long_interval: %d, num_short: %d",