projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[cascardo/linux.git]
/
drivers
/
net
/
wireless
/
ath
/
ath9k
/
htc_drv_main.c
diff --git
a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
index
172a9ff
..
a680a97
100644
(file)
--- a/
drivers/net/wireless/ath/ath9k/htc_drv_main.c
+++ b/
drivers/net/wireless/ath/ath9k/htc_drv_main.c
@@
-1659,7
+1659,7
@@
static int ath9k_htc_ampdu_action(struct ieee80211_hw *hw,
struct ieee80211_vif *vif,
enum ieee80211_ampdu_mlme_action action,
struct ieee80211_sta *sta,
- u16 tid, u16 *ssn, u8 buf_size)
+ u16 tid, u16 *ssn, u8 buf_size
, bool amsdu
)
{
struct ath9k_htc_priv *priv = hw->priv;
struct ath9k_htc_sta *ista;