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/rt2x00/rt2x00mac.c | |
| 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/rt2x00/rt2x00mac.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00mac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c index 20c6eccce5aa..9161c02d8ff9 100644 --- a/drivers/net/wireless/rt2x00/rt2x00mac.c +++ b/drivers/net/wireless/rt2x00/rt2x00mac.c | |||
| @@ -748,7 +748,7 @@ void rt2x00mac_rfkill_poll(struct ieee80211_hw *hw) | |||
| 748 | } | 748 | } |
| 749 | EXPORT_SYMBOL_GPL(rt2x00mac_rfkill_poll); | 749 | EXPORT_SYMBOL_GPL(rt2x00mac_rfkill_poll); |
| 750 | 750 | ||
| 751 | void rt2x00mac_flush(struct ieee80211_hw *hw, bool drop) | 751 | void rt2x00mac_flush(struct ieee80211_hw *hw, u32 queues, bool drop) |
| 752 | { | 752 | { |
| 753 | struct rt2x00_dev *rt2x00dev = hw->priv; | 753 | struct rt2x00_dev *rt2x00dev = hw->priv; |
| 754 | struct data_queue *queue; | 754 | struct data_queue *queue; |