From e6cadb215cba051464eaeba8040d8c82d524b088 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Tue, 1 Oct 2019 23:28:36 +0200 Subject: mac80211: Update to version 5.4-rc2 This updates mac80211 to backports based on kernel 5.4-rc2 ath10k-ct was updated to match the API changes and iw now uses the new nl80211.h header file. Signed-off-by: Hauke Mehrtens --- ...-pass-the-vif-to-cancel_remain_on_channel.patch | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 package/kernel/ath10k-ct/patches/170-mac80211-pass-the-vif-to-cancel_remain_on_channel.patch (limited to 'package/kernel/ath10k-ct/patches/170-mac80211-pass-the-vif-to-cancel_remain_on_channel.patch') diff --git a/package/kernel/ath10k-ct/patches/170-mac80211-pass-the-vif-to-cancel_remain_on_channel.patch b/package/kernel/ath10k-ct/patches/170-mac80211-pass-the-vif-to-cancel_remain_on_channel.patch new file mode 100644 index 0000000000..ee9667ccb0 --- /dev/null +++ b/package/kernel/ath10k-ct/patches/170-mac80211-pass-the-vif-to-cancel_remain_on_channel.patch @@ -0,0 +1,41 @@ +From 5db4c4b9559f8cddd5f7f74e58c7b8f172120e6d Mon Sep 17 00:00:00 2001 +From: Emmanuel Grumbach +Date: Tue, 23 Jul 2019 21:00:01 +0300 +Subject: [PATCH] mac80211: pass the vif to cancel_remain_on_channel + +This low level driver can find it useful to get the vif +when a remain on channel session is cancelled. + +iwlwifi will need this soon. + +Signed-off-by: Emmanuel Grumbach +Link: https://lore.kernel.org/r/20190723180001.5828-1-emmanuel.grumbach@intel.com +Signed-off-by: Johannes Berg +--- + drivers/net/wireless/ath/ath10k/mac.c | 3 ++- + 10 files changed, 4 insertions(+), 2 deletions(-) + +--- a/ath10k-4.19/mac.c ++++ b/ath10k-4.19/mac.c +@@ -7775,7 +7775,8 @@ exit: + return ret; + } + +-static int ath10k_cancel_remain_on_channel(struct ieee80211_hw *hw) ++static int ath10k_cancel_remain_on_channel(struct ieee80211_hw *hw, ++ struct ieee80211_vif *vif) + { + struct ath10k *ar = hw->priv; + +--- a/ath10k-5.2/mac.c ++++ b/ath10k-5.2/mac.c +@@ -7883,7 +7883,8 @@ exit: + return ret; + } + +-static int ath10k_cancel_remain_on_channel(struct ieee80211_hw *hw) ++static int ath10k_cancel_remain_on_channel(struct ieee80211_hw *hw, ++ struct ieee80211_vif *vif) + { + struct ath10k *ar = hw->priv; + -- cgit v1.2.3