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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
wireless
/
iwlwifi
/
dvm
/
mac80211.c
diff --git
a/drivers/net/wireless/iwlwifi/dvm/mac80211.c
b/drivers/net/wireless/iwlwifi/dvm/mac80211.c
index c7cd2dffa5cdbac4719cc9c0ec7431a218e743a2..a7294fa4d7e54851566c6560ffd7d825927b8f25 100644
(file)
--- a/
drivers/net/wireless/iwlwifi/dvm/mac80211.c
+++ b/
drivers/net/wireless/iwlwifi/dvm/mac80211.c
@@
-1100,7
+1100,7
@@
static void iwlagn_configure_filter(struct ieee80211_hw *hw,
FIF_BCN_PRBRESP_PROMISC | FIF_CONTROL;
}
-static void iwlagn_mac_flush(struct ieee80211_hw *hw, bool drop)
+static void iwlagn_mac_flush(struct ieee80211_hw *hw,
u32 queues,
bool drop)
{
struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);