diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-03-25 16:38:02 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-03-25 16:38:02 -0400 |
| commit | c78b3841fac9a59c7494be143aa7f2e69ea47958 (patch) | |
| tree | 503c1279d2bdf8b295ba7d2eb81830c5eb6bfb32 /drivers/net/wireless/ath/carl9170 | |
| parent | 0d4e67174b03e3dcfe75ce7ec488770a5d443bf4 (diff) | |
| parent | f00f188f8212fec9976394976c4fd5d4a3bc4dcf (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.c | 2 |
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 f293b3ff4756..08b193199946 100644 --- a/drivers/net/wireless/ath/carl9170/main.c +++ b/drivers/net/wireless/ath/carl9170/main.c | |||
| @@ -1703,7 +1703,7 @@ found: | |||
| 1703 | return 0; | 1703 | return 0; |
| 1704 | } | 1704 | } |
| 1705 | 1705 | ||
| 1706 | static void carl9170_op_flush(struct ieee80211_hw *hw, bool drop) | 1706 | static void carl9170_op_flush(struct ieee80211_hw *hw, u32 queues, bool drop) |
| 1707 | { | 1707 | { |
| 1708 | struct ar9170 *ar = hw->priv; | 1708 | struct ar9170 *ar = hw->priv; |
| 1709 | unsigned int vid; | 1709 | unsigned int vid; |