diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-05-02 13:47:50 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-05-02 13:47:50 -0400 |
| commit | 406a94d7fae94a893c3afb9c2d18c83124d3cd9b (patch) | |
| tree | c81f4de219ff9309a3f8f60c7855a620b8598ef4 /drivers/staging | |
| parent | c25aaf814a63f9d9c4e45416f13d70ef0aa0be2e (diff) | |
| parent | 48d11dc37977614a461bfedddc52d1c651bc279f (diff) | |
| download | op-kernel-dev-406a94d7fae94a893c3afb9c2d18c83124d3cd9b.zip op-kernel-dev-406a94d7fae94a893c3afb9c2d18c83124d3cd9b.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
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 ff3139b..63ae2d1 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, |
