projects
/
carl9170fw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mac80211: Self-protected management frames are not robust
[carl9170fw.git]
/
carlfw
/
include
/
carl9170.h
diff --git
a/carlfw/include/carl9170.h
b/carlfw/include/carl9170.h
index 72bd6118a34029673d8d1946d0f9c59722f78b47..b4a7fe72f2a4a453b7fdb3a246290c4852ced8fc 100644
(file)
--- a/
carlfw/include/carl9170.h
+++ b/
carlfw/include/carl9170.h
@@
-69,6
+69,8
@@
enum carl9170_suspend_mode {
CARL9170_AWAKE_HOST,
};
CARL9170_AWAKE_HOST,
};
+typedef void (*fw_desc_callback_t)(void *, const bool);
+
/*
* This platform - being an odd 32-bit architecture - prefers to
* have 32-Bit variables.
/*
* This platform - being an odd 32-bit architecture - prefers to
* have 32-Bit variables.
@@
-100,8
+102,8
@@
struct firmware_context_struct {
struct carl9170_tx_superframe *ampdu_prev[__AR9170_NUM_TX_QUEUES];
/* Hardware DMA queue unstuck/fix detection */
struct carl9170_tx_superframe *ampdu_prev[__AR9170_NUM_TX_QUEUES];
/* Hardware DMA queue unstuck/fix detection */
- unsigned int last_
tx_desc
_num[__AR9170_NUM_TX_QUEUES];
- struct
dma_desc *last_tx_desc
[__AR9170_NUM_TX_QUEUES];
+ unsigned int last_
super
_num[__AR9170_NUM_TX_QUEUES];
+ struct
carl9170_tx_superframe *last_super
[__AR9170_NUM_TX_QUEUES];
unsigned int mac_reset;
unsigned int soft_int;
unsigned int mac_reset;
unsigned int soft_int;
@@
-129,14
+131,16
@@
struct firmware_context_struct {
tx_status_tail_idx;
struct carl9170_tx_status tx_status_cache[CARL9170_TX_STATUS_NUM];
tx_status_tail_idx;
struct carl9170_tx_status tx_status_cache[CARL9170_TX_STATUS_NUM];
-#ifdef CONFIG_CARL9170FW_HANDLE_BACK_REQ
+ /* internal descriptor for use within the service routines */
+ struct dma_desc *fw_desc;
+ unsigned int fw_desc_available;
+ void *fw_desc_data;
+ fw_desc_callback_t fw_desc_callback;
+
/* BA(R) Request Handler */
/* BA(R) Request Handler */
- struct dma_desc *ba_desc;
struct carl9170_bar_ctx ba_cache[CONFIG_CARL9170FW_BACK_REQS_NUM];
struct carl9170_bar_ctx ba_cache[CONFIG_CARL9170FW_BACK_REQS_NUM];
- unsigned int ba_desc_available,
- ba_tail_idx,
+ unsigned int ba_tail_idx,
ba_head_idx;
ba_head_idx;
-#endif /* CONFIG_CARL9170FW_HANDLE_BACK_REQ */
} wlan;
struct {
} wlan;
struct {