From 6be81198eee9514eb603fd4a3240d308e8b1dced Mon Sep 17 00:00:00 2001 From: Ondrej Jirman Date: Thu, 13 Oct 2022 19:29:43 +0200 Subject: [PATCH 143/389] 8723cs: Port to 6.1 --- .../rtl8723cs/os_dep/linux/ioctl_cfg80211.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/staging/rtl8723cs/os_dep/linux/ioctl_cfg80211.c b/drivers/staging/rtl8723cs/os_dep/linux/ioctl_cfg80211.c index 67fc705a16c0..f50a9abaad89 100644 --- a/drivers/staging/rtl8723cs/os_dep/linux/ioctl_cfg80211.c +++ b/drivers/staging/rtl8723cs/os_dep/linux/ioctl_cfg80211.c @@ -452,7 +452,7 @@ u8 rtw_cfg80211_ch_switch_notify(_adapter *adapter, u8 ch, u8 bw, u8 offset, goto exit; if (started) { - cfg80211_ch_switch_started_notify(adapter->pnetdev, &chdef, 0, false); + cfg80211_ch_switch_started_notify(adapter->pnetdev, &chdef, 0, 0, false); goto exit; } @@ -1867,6 +1867,7 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_param } static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev + , int link_id , u8 key_index #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE) , bool pairwise @@ -2029,6 +2030,7 @@ static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev } static int cfg80211_rtw_get_key(struct wiphy *wiphy, struct net_device *ndev + , int link_id , u8 keyid #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE) , bool pairwise @@ -2216,11 +2218,12 @@ static int cfg80211_rtw_get_key(struct wiphy *wiphy, struct net_device *ndev return ret; } -static int cfg80211_rtw_del_key(struct wiphy *wiphy, struct net_device *ndev, +static int cfg80211_rtw_del_key(struct wiphy *wiphy, struct net_device *ndev + , int link_id #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE) - u8 key_index, bool pairwise, const u8 *mac_addr) + , u8 key_index, bool pairwise, const u8 *mac_addr) #else /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) */ - u8 key_index, const u8 *mac_addr) + , u8 key_index, const u8 *mac_addr) #endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) */ { _adapter *padapter = (_adapter *)rtw_netdev_priv(ndev); @@ -2237,7 +2240,7 @@ static int cfg80211_rtw_del_key(struct wiphy *wiphy, struct net_device *ndev, } static int cfg80211_rtw_set_default_key(struct wiphy *wiphy, - struct net_device *ndev, u8 key_index + struct net_device *ndev, int link_id, u8 key_index #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)) || defined(COMPAT_KERNEL_RELEASE) , bool unicast, bool multicast #endif @@ -2285,7 +2288,7 @@ static int cfg80211_rtw_set_default_key(struct wiphy *wiphy, #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)) int cfg80211_rtw_set_default_mgmt_key(struct wiphy *wiphy, - struct net_device *ndev, u8 key_index) + struct net_device *ndev, int link_id, u8 key_index) { #define SET_DEF_KEY_PARAM_FMT " key_index=%d" #define SET_DEF_KEY_PARAM_ARG , key_index -- 2.35.3