aboutsummaryrefslogtreecommitdiff
path: root/sys/contrib/dev
diff options
context:
space:
mode:
authorBjoern A. Zeeb <bz@FreeBSD.org>2022-06-12 18:35:58 +0000
committerBjoern A. Zeeb <bz@FreeBSD.org>2022-06-12 18:35:58 +0000
commit0f7b9777f8f39fbc230b3e1de2f844d9f839adea (patch)
tree5aba1f78888cf5e22d420f176badcf58eee7f4fb /sys/contrib/dev
parent987d26ee3f7a1685f7070db834478964170b6f62 (diff)
rtw88: split driver up into a core and pci part
Split the driver up into two modules (if_rtw88_pci.ko and rtw88_core.ko). This is in preparation for the hopefully eventually upcoming USB support using the same driver core. Note: this changes the module name to load to if_rtw88_pci.ko instead of if_rtw88.ko. If using devmatch(8) everything should stay the same as the driver name (used for net.wlan.devices) stays rtw88. If using kld_list in rc.conf or loader.conf you will need to adjust the name. Update man page for this. MFC after: 3 days
Diffstat (limited to 'sys/contrib/dev')
-rw-r--r--sys/contrib/dev/rtw88/main.c8
-rw-r--r--sys/contrib/dev/rtw88/pci.c10
2 files changed, 12 insertions, 6 deletions
diff --git a/sys/contrib/dev/rtw88/main.c b/sys/contrib/dev/rtw88/main.c
index 2f397ace02b3..2522056c3e4b 100644
--- a/sys/contrib/dev/rtw88/main.c
+++ b/sys/contrib/dev/rtw88/main.c
@@ -2120,3 +2120,11 @@ EXPORT_SYMBOL(rtw_unregister_hw);
MODULE_AUTHOR("Realtek Corporation");
MODULE_DESCRIPTION("Realtek 802.11ac wireless core module");
MODULE_LICENSE("Dual BSD/GPL");
+#if defined(__FreeBSD__)
+MODULE_VERSION(rtw88_core, 1);
+MODULE_DEPEND(rtw88_core, linuxkpi, 1, 1, 1);
+MODULE_DEPEND(rtw88_core, linuxkpi_wlan, 1, 1, 1);
+#ifdef CONFIG_RTW88_DEBUGFS
+MODULE_DEPEND(rtw88_core, debugfs, 1, 1, 1);
+#endif
+#endif
diff --git a/sys/contrib/dev/rtw88/pci.c b/sys/contrib/dev/rtw88/pci.c
index 431d0c1c8b98..34d58b0f3db3 100644
--- a/sys/contrib/dev/rtw88/pci.c
+++ b/sys/contrib/dev/rtw88/pci.c
@@ -1936,10 +1936,8 @@ MODULE_AUTHOR("Realtek Corporation");
MODULE_DESCRIPTION("Realtek 802.11ac wireless PCI driver");
MODULE_LICENSE("Dual BSD/GPL");
#if defined(__FreeBSD__)
-MODULE_VERSION(rtw_pci, 1);
-MODULE_DEPEND(rtw_pci, linuxkpi, 1, 1, 1);
-MODULE_DEPEND(rtw_pci, linuxkpi_wlan, 1, 1, 1);
-#ifdef CONFIG_RTW88_DEBUGFS
-MODULE_DEPEND(rtw_pci, debugfs, 1, 1, 1);
-#endif
+MODULE_VERSION(rtw88_pci, 1);
+MODULE_DEPEND(rtw88_pci, rtw88_core, 1, 1, 1);
+MODULE_DEPEND(rtw88_pci, linuxkpi, 1, 1, 1);
+MODULE_DEPEND(rtw88_pci, linuxkpi_wlan, 1, 1, 1);
#endif