projects
/
carl9170fw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
carl9170 firmware: get rid of nested wlan_tx calls
[carl9170fw.git]
/
carlfw
/
src
/
cmd.c
diff --git
a/carlfw/src/cmd.c
b/carlfw/src/cmd.c
index 4b246f1eb6fa793f36b8c67c8895e42c762d5b6b..5382083c0b6dae7415962e47683bf474e63385ec 100644
(file)
--- a/
carlfw/src/cmd.c
+++ b/
carlfw/src/cmd.c
@@
-30,6
+30,7
@@
#include "printf.h"
#include "timer.h"
#include "wl.h"
#include "printf.h"
#include "timer.h"
#include "wl.h"
+#include "wol.h"
void handle_cmd(struct carl9170_rsp *resp)
{
void handle_cmd(struct carl9170_rsp *resp)
{
@@
-86,11
+87,9
@@
void handle_cmd(struct carl9170_rsp *resp)
fw.wlan.rx_filter = cmd->rx_filter.rx_filter;
break;
fw.wlan.rx_filter = cmd->rx_filter.rx_filter;
break;
-#ifdef CONFIG_CARL9170FW_WOL
case CARL9170_CMD_WOL:
case CARL9170_CMD_WOL:
-
memcpy(&fw.wlan.wol.cmd, &cmd->wol, sizeof(cmd->wol)
);
+
wol_cmd(&cmd->wol
);
break;
break;
-#endif /* CONFIG_CARL9170FW_WOL */
case CARL9170_CMD_TALLY:
resp->hdr.len = sizeof(struct carl9170_tally_rsp);
case CARL9170_CMD_TALLY:
resp->hdr.len = sizeof(struct carl9170_tally_rsp);
@@
-111,7
+110,7
@@
void handle_cmd(struct carl9170_rsp *resp)
set(AR9170_MAC_REG_BCN_CTRL, AR9170_BCN_CTRL_READY);
} else {
wlan_cab_flush_queue(cmd->bcn_ctrl.vif_id);
set(AR9170_MAC_REG_BCN_CTRL, AR9170_BCN_CTRL_READY);
} else {
wlan_cab_flush_queue(cmd->bcn_ctrl.vif_id);
- fw.wlan.cab_flush_trigger[
i
] = CARL9170_CAB_TRIGGER_EMPTY;
+ fw.wlan.cab_flush_trigger[
cmd->bcn_ctrl.vif_id
] = CARL9170_CAB_TRIGGER_EMPTY;
}
break;
#endif /* CONFIG_CARL9170FW_CAB_QUEUE */
}
break;
#endif /* CONFIG_CARL9170FW_CAB_QUEUE */
@@
-126,7
+125,7
@@
void handle_cmd(struct carl9170_rsp *resp)
resp->hdr.len = 0;
disable_key(&cmd->disablekey);
break;
resp->hdr.len = 0;
disable_key(&cmd->disablekey);
break;
-#endif /* CONFIG_CARL9170FW_SECURIT_ENGINE */
+#endif /* CONFIG_CARL9170FW_SECURIT
Y
_ENGINE */
#ifdef CONFIG_CARL9170FW_RADIO_FUNCTIONS
case CARL9170_CMD_FREQUENCY:
#ifdef CONFIG_CARL9170FW_RADIO_FUNCTIONS
case CARL9170_CMD_FREQUENCY:
@@
-146,7
+145,7
@@
void handle_cmd(struct carl9170_rsp *resp)
fw.phy.psm.state = le32_to_cpu(cmd->psm.state);
rf_psm();
break;
fw.phy.psm.state = le32_to_cpu(cmd->psm.state);
rf_psm();
break;
-#endif /* CONFIG_CARL9170FW_RADIO_FUNCTIOS */
+#endif /* CONFIG_CARL9170FW_RADIO_FUNCTIO
N
S */
default:
BUG("Unknown command %x\n", cmd->hdr.cmd);
default:
BUG("Unknown command %x\n", cmd->hdr.cmd);