projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge ath-next from ath.git
[cascardo/linux.git]
/
drivers
/
net
/
wireless
/
ath
/
ath10k
/
core.h
diff --git
a/drivers/net/wireless/ath/ath10k/core.h
b/drivers/net/wireless/ath/ath10k/core.h
index
4cc410d
..
3c8a510
100644
(file)
--- a/
drivers/net/wireless/ath/ath10k/core.h
+++ b/
drivers/net/wireless/ath/ath10k/core.h
@@
-81,22
+81,20
@@
static inline const char *ath10k_bus_str(enum ath10k_bus bus)
return "unknown";
}
return "unknown";
}
+enum ath10k_skb_flags {
+ ATH10K_SKB_F_NO_HWCRYPT = BIT(0),
+ ATH10K_SKB_F_DTIM_ZERO = BIT(1),
+ ATH10K_SKB_F_DELIVER_CAB = BIT(2),
+ ATH10K_SKB_F_MGMT = BIT(3),
+ ATH10K_SKB_F_QOS = BIT(4),
+};
+
struct ath10k_skb_cb {
dma_addr_t paddr;
struct ath10k_skb_cb {
dma_addr_t paddr;
+ u8 flags;
u8 eid;
u8 eid;
- u8 vdev_id;
-
- struct {
- u8 tid;
- bool nohwcrypt;
- struct ath10k_htt_txbuf *txbuf;
- u32 txbuf_paddr;
- } __packed htt;
-
- struct {
- bool dtim_zero;
- bool deliver_cab;
- } bcn;
+ u16 msdu_id;
+ struct ieee80211_vif *vif;
} __packed;
struct ath10k_skb_rxcb {
} __packed;
struct ath10k_skb_rxcb {
@@
-744,7
+742,7
@@
struct ath10k {
bool monitor_started;
unsigned int filter_flags;
unsigned long dev_flags;
bool monitor_started;
unsigned int filter_flags;
unsigned long dev_flags;
-
u32
dfs_block_radar_events;
+
bool
dfs_block_radar_events;
/* protected by conf_mutex */
bool radar_enabled;
/* protected by conf_mutex */
bool radar_enabled;