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 branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
wireless
/
rt2x00
/
rt2x00mac.c
diff --git
a/drivers/net/wireless/rt2x00/rt2x00mac.c
b/drivers/net/wireless/rt2x00/rt2x00mac.c
index ddeb5a709aa36d6375e58597104f4cc3cb632d12..30a2367ba8d661be4c94dc3c576292ca25b6e86b 100644
(file)
--- a/
drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/
drivers/net/wireless/rt2x00/rt2x00mac.c
@@
-747,7
+747,8
@@
void rt2x00mac_rfkill_poll(struct ieee80211_hw *hw)
}
EXPORT_SYMBOL_GPL(rt2x00mac_rfkill_poll);
}
EXPORT_SYMBOL_GPL(rt2x00mac_rfkill_poll);
-void rt2x00mac_flush(struct ieee80211_hw *hw, u32 queues, bool drop)
+void rt2x00mac_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+ u32 queues, bool drop)
{
struct rt2x00_dev *rt2x00dev = hw->priv;
struct data_queue *queue;
{
struct rt2x00_dev *rt2x00dev = hw->priv;
struct data_queue *queue;