wl1271: use channel 1 when configuring the data path
In the data path configuration, one of the parameters is the channel. We have been setting it to wl->channel, which is not correct in this case. This channel has nothing to do with the channel we're currently tuned to, since it is only used for calibration during this phase. Hardcoded the channel to 1, according to the reference driver. Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com> Reviewed-by: Juuso Oikarinen <juuso.oikarinen@nokia.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Este commit está contenido en:

cometido por
John W. Linville

padre
3ed8f2c614
commit
94210897e2
@@ -505,7 +505,7 @@ int wl1271_cmd_configure(struct wl1271 *wl, u16 id, void *buf, size_t len)
|
||||
return 0;
|
||||
}
|
||||
|
||||
int wl1271_cmd_data_path(struct wl1271 *wl, u8 channel, bool enable)
|
||||
int wl1271_cmd_data_path(struct wl1271 *wl, bool enable)
|
||||
{
|
||||
struct cmd_enabledisable_path *cmd;
|
||||
int ret;
|
||||
@@ -519,7 +519,8 @@ int wl1271_cmd_data_path(struct wl1271 *wl, u8 channel, bool enable)
|
||||
goto out;
|
||||
}
|
||||
|
||||
cmd->channel = channel;
|
||||
/* the channel here is only used for calibration, so hardcoded to 1 */
|
||||
cmd->channel = 1;
|
||||
|
||||
if (enable) {
|
||||
cmd_rx = CMD_ENABLE_RX;
|
||||
@@ -532,22 +533,22 @@ int wl1271_cmd_data_path(struct wl1271 *wl, u8 channel, bool enable)
|
||||
ret = wl1271_cmd_send(wl, cmd_rx, cmd, sizeof(*cmd), 0);
|
||||
if (ret < 0) {
|
||||
wl1271_error("rx %s cmd for channel %d failed",
|
||||
enable ? "start" : "stop", channel);
|
||||
enable ? "start" : "stop", cmd->channel);
|
||||
goto out;
|
||||
}
|
||||
|
||||
wl1271_debug(DEBUG_BOOT, "rx %s cmd channel %d",
|
||||
enable ? "start" : "stop", channel);
|
||||
enable ? "start" : "stop", cmd->channel);
|
||||
|
||||
ret = wl1271_cmd_send(wl, cmd_tx, cmd, sizeof(*cmd), 0);
|
||||
if (ret < 0) {
|
||||
wl1271_error("tx %s cmd for channel %d failed",
|
||||
enable ? "start" : "stop", channel);
|
||||
enable ? "start" : "stop", cmd->channel);
|
||||
return ret;
|
||||
}
|
||||
|
||||
wl1271_debug(DEBUG_BOOT, "tx %s cmd channel %d",
|
||||
enable ? "start" : "stop", channel);
|
||||
enable ? "start" : "stop", cmd->channel);
|
||||
|
||||
out:
|
||||
kfree(cmd);
|
||||
|
Referencia en una nueva incidencia
Block a user