projects
/
firefly-linux-kernel-4.4.55.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
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
wireless
/
ath
/
ath10k
/
mac.c
diff --git
a/drivers/net/wireless/ath/ath10k/mac.c
b/drivers/net/wireless/ath/ath10k/mac.c
index f00aafd2c768fae99a2dda696d3588478d6ceb03..484c1a10372f13a9fead3d7c4f4368080ab9f10a 100644
(file)
--- a/
drivers/net/wireless/ath/ath10k/mac.c
+++ b/
drivers/net/wireless/ath/ath10k/mac.c
@@
-6212,7
+6212,7
@@
static int ath10k_ampdu_action(struct ieee80211_hw *hw,
struct ieee80211_vif *vif,
enum ieee80211_ampdu_mlme_action action,
struct ieee80211_sta *sta, u16 tid, u16 *ssn,
struct ieee80211_vif *vif,
enum ieee80211_ampdu_mlme_action action,
struct ieee80211_sta *sta, u16 tid, u16 *ssn,
- u8 buf_size)
+ u8 buf_size
, bool amsdu
)
{
struct ath10k *ar = hw->priv;
struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);
{
struct ath10k *ar = hw->priv;
struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);