Sophie

Sophie

distrib > Mageia > 8 > armv7hl > media > core-backports-src > by-pkgid > 18e5a698abeca51c4b160a43cd401c92 > files > 15

kernel-5.19.3-1.mga8.src.rpm


Adjust for this landing in 5.19.2:
****
From 1e909789f5c02c304b1d33c0ac51366dce7274f4 Mon Sep 17 00:00:00 2001
From: Sasha Levin <sashal@kernel.org>
Date: Thu, 14 Apr 2022 16:50:57 +0200
Subject: wifi: cfg80211: do some rework towards MLO link APIs
***

Signed-off-by: Thomas Backlund <tmb@mageia.org>
---
 3rdparty/rtl8812au/os_dep/linux/ioctl_cfg80211.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff -urp linux-5.19/3rdparty/rtl8812au.orig/os_dep/linux/ioctl_cfg80211.c linux-5.19/3rdparty/rtl8812au/os_dep/linux/ioctl_cfg80211.c
--- linux-5.19/3rdparty/rtl8812au.orig/os_dep/linux/ioctl_cfg80211.c	2022-08-17 18:57:51.747868690 +0300
+++ linux-5.19/3rdparty/rtl8812au/os_dep/linux/ioctl_cfg80211.c	2022-08-17 21:04:46.805611843 +0300
@@ -472,7 +472,7 @@ u8 rtw_cfg80211_ch_switch_notify(_adapte
 	if (!rtw_cfg80211_allow_ch_switch_notify(adapter))
 		goto exit;
 
-	cfg80211_ch_switch_notify(adapter->pnetdev, &chdef);
+	cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0);
 
 #else
 	int freq = rtw_ch2freq(ch);
@@ -5219,7 +5219,7 @@ static int cfg80211_rtw_change_beacon(st
 	return ret;
 }
 
-static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev)
+static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev, unsigned int link_id)
 {
 	_adapter *adapter = (_adapter *)rtw_netdev_priv(ndev);
 
@@ -6092,7 +6092,7 @@ static int	cfg80211_rtw_set_channel(stru
 	return 0;
 }
 
-static int cfg80211_rtw_get_channel(struct wiphy *wiphy, struct wireless_dev *wdev, struct cfg80211_chan_def *chandef){
+static int cfg80211_rtw_get_channel(struct wiphy *wiphy, struct wireless_dev *wdev, unsigned int link_id, struct cfg80211_chan_def *chandef){
 	_adapter *padapter= wiphy_to_adapter(wiphy);
 	int channel;
 	int control_freq;
@@ -10395,7 +10395,7 @@ void rtw_wdev_unregister(struct wireless
 	rtw_cfg80211_indicate_scan_done(adapter, _TRUE);
 
 	#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)) || defined(COMPAT_KERNEL_RELEASE)
-	if (wdev->current_bss) {
+	if (wdev->connected) {
 		RTW_INFO(FUNC_ADPT_FMT" clear current_bss by cfg80211_disconnected\n", FUNC_ADPT_ARG(adapter));
 		rtw_cfg80211_indicate_disconnect(adapter, 0, 1);
 	}