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 tag 'wireless-drivers-next-for-davem-2015-10-09' of git://git.kernel.org/pub...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
wireless
/
iwlwifi
/
mvm
/
mac80211.c
diff --git
a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
index d7275a5f7f005f38b56be9044217e53f4aa61995..8443e14101cfe304247cfc868e99682a13473e71 100644
(file)
--- a/
drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/
drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@
-820,7
+820,7
@@
static int iwl_mvm_mac_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 *ssn, u8 buf_size
, bool amsdu
)
{
struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
int ret;