Merge branch 'main' of https://github.com/morrownr/8821cu-20210916

H-Nestler · Jul 22, 2023 · 104e31a · 104e31a
2 parents 6d2f728 + 4efe623
commit 104e31a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c
@@ -8507,6 +8507,9 @@ static int cfg80211_rtw_tdls_mgmt(struct wiphy *wiphy,
 	const u8 *peer,
 #else
 	u8 *peer,
+#endif
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 5, 0))
+	int link_id,
 #endif
 	u8 action_code,
 	u8 dialog_token,

diff --git a/os_dep/osdep_service.c b/os_dep/osdep_service.c
@@ -3533,3 +3533,4 @@ int hwaddr_aton_i(const char *txt, u8 *addr)
 	return 0;
 }
 
+MODULE_IMPORT_NS(VFS_internal_I_am_really_a_filesystem_and_am_NOT_a_driver);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3533,3 +3533,4 @@ int hwaddr_aton_i(const char txt, u8 addr)
		return 0;
		}

		MODULE_IMPORT_NS(VFS_internal_I_am_really_a_filesystem_and_am_NOT_a_driver);