mac80211: Update to version 5.4-rc2
[openwrt/openwrt.git] / package / kernel / ath10k-ct / patches / 170-mac80211-pass-the-vif-to-cancel_remain_on_channel.patch
1 From 5db4c4b9559f8cddd5f7f74e58c7b8f172120e6d Mon Sep 17 00:00:00 2001
2 From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
3 Date: Tue, 23 Jul 2019 21:00:01 +0300
4 Subject: [PATCH] mac80211: pass the vif to cancel_remain_on_channel
5
6 This low level driver can find it useful to get the vif
7 when a remain on channel session is cancelled.
8
9 iwlwifi will need this soon.
10
11 Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
12 Link: https://lore.kernel.org/r/20190723180001.5828-1-emmanuel.grumbach@intel.com
13 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
14 ---
15 drivers/net/wireless/ath/ath10k/mac.c | 3 ++-
16 10 files changed, 4 insertions(+), 2 deletions(-)
17
18 --- a/ath10k-4.19/mac.c
19 +++ b/ath10k-4.19/mac.c
20 @@ -7775,7 +7775,8 @@ exit:
21 return ret;
22 }
23
24 -static int ath10k_cancel_remain_on_channel(struct ieee80211_hw *hw)
25 +static int ath10k_cancel_remain_on_channel(struct ieee80211_hw *hw,
26 + struct ieee80211_vif *vif)
27 {
28 struct ath10k *ar = hw->priv;
29
30 --- a/ath10k-5.2/mac.c
31 +++ b/ath10k-5.2/mac.c
32 @@ -7883,7 +7883,8 @@ exit:
33 return ret;
34 }
35
36 -static int ath10k_cancel_remain_on_channel(struct ieee80211_hw *hw)
37 +static int ath10k_cancel_remain_on_channel(struct ieee80211_hw *hw,
38 + struct ieee80211_vif *vif)
39 {
40 struct ath10k *ar = hw->priv;
41