mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 00:41:17 +00:00
e6cadb215c
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 <hauke@hauke-m.de>
42 lines
1.3 KiB
Diff
42 lines
1.3 KiB
Diff
From 5db4c4b9559f8cddd5f7f74e58c7b8f172120e6d Mon Sep 17 00:00:00 2001
|
|
From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
|
|
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 <emmanuel.grumbach@intel.com>
|
|
Link: https://lore.kernel.org/r/20190723180001.5828-1-emmanuel.grumbach@intel.com
|
|
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
---
|
|
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;
|
|
|