diff options
author | John W. Linville <linville@tuxdriver.com> | 2014-04-30 20:04:27 +0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-04-30 20:04:27 +0400 |
commit | f6595444c1ee798f9c227107bb3ab14730c6497a (patch) | |
tree | e8e06d7c2057c69e19848ee3abd6720927f5f9f9 /drivers/staging | |
parent | 0006433a5be9e0e155ad493e33c6e9bf3868a87f (diff) | |
parent | f55ee0834247c88cb6981cb11eb1870392878371 (diff) | |
download | linux-f6595444c1ee798f9c227107bb3ab14730c6497a.tar.xz |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Conflicts:
net/mac80211/chan.c
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/rtl8821ae/core.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/drivers/staging/rtl8821ae/core.c b/drivers/staging/rtl8821ae/core.c index ff3139b6da65..63ae2d1997d3 100644 --- a/drivers/staging/rtl8821ae/core.c +++ b/drivers/staging/rtl8821ae/core.c @@ -1414,23 +1414,15 @@ static void rtl_op_rfkill_poll(struct ieee80211_hw *hw) * before switch channel or power save, or tx buffer packet * maybe send after offchannel or rf sleep, this may cause * dis-association by AP */ -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)) -static void rtl_op_flush(struct ieee80211_hw *hw, u32 queues, bool drop) +static void rtl_op_flush(struct ieee80211_hw *hw, + struct ieee80211_vif *vif, + u32 queues, bool drop) { struct rtl_priv *rtlpriv = rtl_priv(hw); if (rtlpriv->intf_ops->flush) rtlpriv->intf_ops->flush(hw, queues, drop); } -#else -static void rtl_op_flush(struct ieee80211_hw *hw, bool drop) -{ - struct rtl_priv *rtlpriv = rtl_priv(hw); - - if (rtlpriv->intf_ops->flush) - rtlpriv->intf_ops->flush(hw, drop); -} -#endif const struct ieee80211_ops rtl_ops = { .start = rtl_op_start, |