summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath/carl9170
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2013-03-25 16:38:02 -0400
committerJohn W. Linville <linville@tuxdriver.com>2013-03-25 16:38:02 -0400
commitc78b3841fac9a59c7494be143aa7f2e69ea47958 (patch)
tree503c1279d2bdf8b295ba7d2eb81830c5eb6bfb32 /drivers/net/wireless/ath/carl9170
parent0d4e67174b03e3dcfe75ce7ec488770a5d443bf4 (diff)
parentf00f188f8212fec9976394976c4fd5d4a3bc4dcf (diff)
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'drivers/net/wireless/ath/carl9170')
-rw-r--r--drivers/net/wireless/ath/carl9170/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/carl9170/main.c b/drivers/net/wireless/ath/carl9170/main.c
index f293b3ff475..08b19319994 100644
--- a/drivers/net/wireless/ath/carl9170/main.c
+++ b/drivers/net/wireless/ath/carl9170/main.c
@@ -1703,7 +1703,7 @@ found:
return 0;
}
-static void carl9170_op_flush(struct ieee80211_hw *hw, bool drop)
+static void carl9170_op_flush(struct ieee80211_hw *hw, u32 queues, bool drop)
{
struct ar9170 *ar = hw->priv;
unsigned int vid;