Initial commit
	
		
			
	
		
	
	
		
	
		
			Some checks failed
		
		
	
	
		
			
				
	
				Build Kernel / Build all affected Kernels (push) Has been cancelled
				
			
		
			
				
	
				Build all core packages / Build all core packages for selected target (push) Has been cancelled
				
			
		
			
				
	
				Build and Push prebuilt tools container / Build and Push all prebuilt containers (push) Has been cancelled
				
			
		
			
				
	
				Build Toolchains / Build Toolchains for each target (push) Has been cancelled
				
			
		
			
				
	
				Build host tools / Build host tools for linux and macos based systems (push) Has been cancelled
				
			
		
			
				
	
				Coverity scan build / Coverity x86/64 build (push) Has been cancelled
				
			
		
		
	
	
				
					
				
			
		
			Some checks failed
		
		
	
	Build Kernel / Build all affected Kernels (push) Has been cancelled
				
			Build all core packages / Build all core packages for selected target (push) Has been cancelled
				
			Build and Push prebuilt tools container / Build and Push all prebuilt containers (push) Has been cancelled
				
			Build Toolchains / Build Toolchains for each target (push) Has been cancelled
				
			Build host tools / Build host tools for linux and macos based systems (push) Has been cancelled
				
			Coverity scan build / Coverity x86/64 build (push) Has been cancelled
				
			This commit is contained in:
		| @@ -0,0 +1,86 @@ | ||||
| From 30fc9d96fa2ce16209306237e677d3d3cbb12685 Mon Sep 17 00:00:00 2001 | ||||
| From: John Thomson <git@johnthomson.fastmail.com.au> | ||||
| Date: Sun, 28 May 2023 13:26:46 +1000 | ||||
| Subject: [PATCH] Revert "fix kernel 6.1 80211 link_id" | ||||
|  | ||||
| This reverts commit a027da58e8d8e95827f97222ca321cd0b2d377dd. | ||||
| --- | ||||
|  os_dep/linux/ioctl_cfg80211.c | 29 +++++------------------------ | ||||
|  1 file changed, 5 insertions(+), 24 deletions(-) | ||||
|  | ||||
| --- a/os_dep/linux/ioctl_cfg80211.c | ||||
| +++ b/os_dep/linux/ioctl_cfg80211.c | ||||
| @@ -797,14 +797,9 @@ check_bss: | ||||
|  #endif | ||||
|   | ||||
|  		DBG_871X(FUNC_ADPT_FMT" call cfg80211_roamed\n", FUNC_ADPT_ARG(padapter)); | ||||
| -#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 0, 0) | ||||
| -		roam_info.links[0].channel = notify_channel; | ||||
| -		roam_info.links[0].bssid = cur_network->network.MacAddress; | ||||
| -#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) | ||||
| +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) | ||||
|  		roam_info.channel = notify_channel; | ||||
|  		roam_info.bssid = cur_network->network.MacAddress; | ||||
| -#endif | ||||
| -#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) | ||||
|  		roam_info.req_ie = pmlmepriv->assoc_req + sizeof(struct rtw_ieee80211_hdr_3addr) + 2; | ||||
|  		roam_info.req_ie_len = pmlmepriv->assoc_req_len - sizeof(struct rtw_ieee80211_hdr_3addr) - 2; | ||||
|  		roam_info.resp_ie = pmlmepriv->assoc_rsp + sizeof(struct rtw_ieee80211_hdr_3addr) + 6; | ||||
| @@ -1393,9 +1388,7 @@ exit: | ||||
|  } | ||||
|   | ||||
|  static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev, | ||||
| -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) | ||||
| -                                int link_id, u8 key_index, bool pairwise, const u8 *mac_addr, | ||||
| -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE) | ||||
| +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE) | ||||
|                                  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, | ||||
| @@ -1535,9 +1528,7 @@ addkey_end: | ||||
|  } | ||||
|   | ||||
|  static int cfg80211_rtw_get_key(struct wiphy *wiphy, struct net_device *ndev, | ||||
| -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) | ||||
| -                                int link_id, u8 key_index, bool pairwise, const u8 *mac_addr, | ||||
| -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE) | ||||
| +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE) | ||||
|                                  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, | ||||
| @@ -1570,9 +1561,7 @@ static int cfg80211_rtw_get_key(struct w | ||||
|  } | ||||
|   | ||||
|  static int cfg80211_rtw_del_key(struct wiphy *wiphy, struct net_device *ndev, | ||||
| -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) | ||||
| -                                int link_id, u8 key_index, bool pairwise, const u8 *mac_addr) | ||||
| -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE) | ||||
| +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE) | ||||
|                                  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) | ||||
| @@ -1592,11 +1581,7 @@ static int cfg80211_rtw_del_key(struct w | ||||
|  } | ||||
|   | ||||
|  static int cfg80211_rtw_set_default_key(struct wiphy *wiphy, | ||||
| -					struct net_device *ndev, | ||||
| -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) | ||||
| -                                        int link_id, | ||||
| -#endif | ||||
| -                                        u8 key_index | ||||
| +                                        struct net_device *ndev, u8 key_index | ||||
|  #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)) || defined(COMPAT_KERNEL_RELEASE) | ||||
|                                          , bool unicast, bool multicast | ||||
|  #endif | ||||
| @@ -4033,11 +4018,7 @@ static int cfg80211_rtw_change_beacon(st | ||||
|  	return ret; | ||||
|  } | ||||
|   | ||||
| -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,0,0)) | ||||
| -static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev, unsigned int link_id) | ||||
| -#else | ||||
|  static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev) | ||||
| -#endif | ||||
|  { | ||||
|  	DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); | ||||
|  	return 0; | ||||
		Reference in New Issue
	
	Block a user
	 domenico
					domenico