diff options
author | David S. Miller <davem@davemloft.net> | 2016-04-11 15:58:12 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-04-11 15:58:12 (GMT) |
commit | bddf59046d804638d998f9015246d4990f1cab09 (patch) | |
tree | 63915173bab44df8515896d56f378dddfd8d1fae /drivers/net/wireless/ath/ath10k/txrx.h | |
parent | 4923ec0b10d998349c2ac4b38aa4674e539e6f92 (diff) | |
parent | 20ac1b325d8d526211b1276ecf9b64b7e8369f50 (diff) | |
download | linux-bddf59046d804638d998f9015246d4990f1cab09.tar.xz |
Merge tag 'wireless-drivers-next-for-davem-2016-04-11' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next
Kalle Valo says:
====================
wireless-drivers patches for 4.7
Major changes:
iwlwifi
* support for Link Quality measurement
* more work 9000 devices and MSIx
* continuation of the Dynamic Queue Allocation work
* make the paging less memory hungry
* 9000 new Rx path
* removal of IWLWIFI_UAPSD Kconfig option
ath10k
* implement push-pull tx model using mac80211 software queuing support
* enable scan in AP mode (NL80211_FEATURE_AP_SCAN)
wil6210
* add basic PBSS (Personal Basic Service Set) support
* add initial P2P support
* add oob_mode module parameter
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/ath/ath10k/txrx.h')
-rw-r--r-- | drivers/net/wireless/ath/ath10k/txrx.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath10k/txrx.h b/drivers/net/wireless/ath/ath10k/txrx.h index a90e09f..e7ea1ae 100644 --- a/drivers/net/wireless/ath/ath10k/txrx.h +++ b/drivers/net/wireless/ath/ath10k/txrx.h @@ -19,8 +19,8 @@ #include "htt.h" -void ath10k_txrx_tx_unref(struct ath10k_htt *htt, - const struct htt_tx_done *tx_done); +int ath10k_txrx_tx_unref(struct ath10k_htt *htt, + const struct htt_tx_done *tx_done); struct ath10k_peer *ath10k_peer_find(struct ath10k *ar, int vdev_id, const u8 *addr); |