projects
/
carl9170fw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
carl9170 firmware: report device tallies
[carl9170fw.git]
/
carlfw
/
src
/
fw.c
diff --git
a/carlfw/src/fw.c
b/carlfw/src/fw.c
index 94c52d1207979ee2b2c83a34781d82b7e0e8af3e..74faf79c5e3ba906f336610e6c6c17d9b0e0b712 100644
(file)
--- a/
carlfw/src/fw.c
+++ b/
carlfw/src/fw.c
@@
-37,6
+37,7
@@
const struct carl9170_firmware_descriptor __section(fwdsc) carl9170fw_desc = {
BIT(CARL9170FW_USB_RESP_EP2) |
BIT(CARL9170FW_HANDLE_BACK_REQ) |
BIT(CARL9170FW_RX_FILTER) |
BIT(CARL9170FW_USB_RESP_EP2) |
BIT(CARL9170FW_HANDLE_BACK_REQ) |
BIT(CARL9170FW_RX_FILTER) |
+ BIT(CARL9170FW_HW_COUNTERS) |
#ifdef CONFIG_CARL9170FW_USB_INIT_FIRMWARE
BIT(CARL9170FW_USB_INIT_FIRMWARE) |
# ifdef CONFIG_CARL9170FW_USB_UP_STREAM
#ifdef CONFIG_CARL9170FW_USB_INIT_FIRMWARE
BIT(CARL9170FW_USB_INIT_FIRMWARE) |
# ifdef CONFIG_CARL9170FW_USB_UP_STREAM
@@
-49,6
+50,7
@@
const struct carl9170_firmware_descriptor __section(fwdsc) carl9170fw_desc = {
#ifdef CONFIG_CARL9170FW_RADIO_FUNCTIONS
BIT(CARL9170FW_COMMAND_PHY) |
BIT(CARL9170FW_PSM) |
#ifdef CONFIG_CARL9170FW_RADIO_FUNCTIONS
BIT(CARL9170FW_COMMAND_PHY) |
BIT(CARL9170FW_PSM) |
+ BIT(CARL9170FW_FIXED_5GHZ_PSM) |
#endif /* CONFIG_CARL9170FW_RADIO_FUNCTIONS */
#ifdef CONFIG_CARL9170FW_SECURITY_ENGINE
BIT(CARL9170FW_COMMAND_CAM) |
#endif /* CONFIG_CARL9170FW_RADIO_FUNCTIONS */
#ifdef CONFIG_CARL9170FW_SECURITY_ENGINE
BIT(CARL9170FW_COMMAND_CAM) |
@@
-83,6
+85,14
@@
const struct carl9170_firmware_descriptor __section(fwdsc) carl9170fw_desc = {
.seq_table_addr = cpu_to_le32(&fw.wlan.sequence),
),
.seq_table_addr = cpu_to_le32(&fw.wlan.sequence),
),
+#ifdef CONFIG_CARL9170FW_WOL
+ FILL(wol, WOL,
+ .supported_triggers = BIT(CARL9170_WOL_DISCONNECT) |
+ BIT(CARL9170_WOL_MAGIC_PKT),
+ ),
+#endif /* CONFIG_CARL9170FW_WOL */
+
+
FILL(motd, MOTD,
.fw_year_month_day = cpu_to_le32(
CARL9170FW_SET_DAY(CARL9170FW_VERSION_DAY) +
FILL(motd, MOTD,
.fw_year_month_day = cpu_to_le32(
CARL9170FW_SET_DAY(CARL9170FW_VERSION_DAY) +
@@
-94,8
+104,8
@@
const struct carl9170_firmware_descriptor __section(fwdsc) carl9170fw_desc = {
FILL(dbg, DBG,
.bogoclock_addr = cpu_to_le32(0),
.counter_addr = cpu_to_le32(&fw.counter),
FILL(dbg, DBG,
.bogoclock_addr = cpu_to_le32(0),
.counter_addr = cpu_to_le32(&fw.counter),
- .rx_total_addr = cpu_to_le32(
&fw.wlan.rx_total
),
- .rx_overrun_addr = cpu_to_le32(
&fw.wlan.rx_overruns
),
+ .rx_total_addr = cpu_to_le32(
0
),
+ .rx_overrun_addr = cpu_to_le32(
0
),
.rx_filter = cpu_to_le32(&fw.wlan.rx_filter),
),
.rx_filter = cpu_to_le32(&fw.wlan.rx_filter),
),