Update Makefile

Merge pull request #1134 from crivasr/v5.6.4.2
Fix change_beacon for kernel 6.7
2024-11-21 21:04:35 +00:00 · 2024-03-16 00:01:23 +01:00 · 2024-03-15 23:59:04 +01:00 · 2024-03-15 23:58:46 +01:00 · 2024-03-15 23:11:21 +01:00 · 2024-03-12 07:14:38 +01:00
4 changed files with 14 additions and 1 deletions
--- a/2
+++ b/2
@ -7,6 +7,8 @@ EXTRA_CFLAGS += -Wno-unused-label
 EXTRA_CFLAGS += -Wno-unused-function
 EXTRA_CFLAGS += -Wno-implicit-fallthrough
 EXTRA_CFLAGS += -Wno-cast-function-type
+EXTRA_CFLAGS += -Wno-missing-declarations
+EXTRA_CFLAGS += -Wno-missing-prototypes
 #EXTRA_CFLAGS += -Wno-error=cast-function-type
 #EXTRA_CFLAGS += -Wno-parentheses-equality
 EXTRA_CFLAGS += -Wno-error=incompatible-pointer-types
--- a/os_dep/linux/ioctl_cfg80211.c
+++ b/os_dep/linux/ioctl_cfg80211.c
@ -5283,9 +5283,16 @@ exit:
 	return ret;
 }

+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 7, 0))
+static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *ndev,
+		struct cfg80211_ap_update *params)
+{
+	struct cfg80211_beacon_data *info = &params->beacon; 
+#else
 static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *ndev,
 		struct cfg80211_beacon_data *info)
 {
+#endif
 	int ret = 0;
 	_adapter *adapter = (_adapter *)rtw_netdev_priv(ndev);

--- a/os_dep/linux/os_intfs.c
+++ b/os_dep/linux/os_intfs.c
@ -17,6 +17,10 @@
 #include <drv_types.h>
 #include <hal_data.h>

+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 8, 0))
+#define strlcpy strscpy
+#endif
+
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Realtek Wireless Lan Driver");
 MODULE_AUTHOR("Realtek Semiconductor Corp.");
--- a/os_dep/linux/usb_intf.c
+++ b/os_dep/linux/usb_intf.c
@ -270,7 +270,7 @@ struct rtw_usb_drv usb_drv = {
 	.usbdrv.supports_autosuspend = 1,
 #endif

-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 19)) && (LINUX_VERSION_CODE < KERNEL_VERSION(6, 8, 0))
 	.usbdrv.drvwrap.driver.shutdown = rtw_dev_shutdown,
 #else
 	.usbdrv.driver.shutdown = rtw_dev_shutdown,
Author	SHA1	Message	Date
Christian Bremvåg	f23979f0d2	Update Makefile	2024-03-16 00:01:23 +01:00
Christian Bremvåg	98895e9f2e	Merge pull request #1134 from crivasr/v5.6.4.2 Fix change_beacon for kernel 6.7	2024-03-15 23:59:04 +01:00
Christian Bremvåg	6b6f1347dc	Update Makefile	2024-03-15 23:58:46 +01:00
Christian Bremvåg	135756af13	Merge pull request #1145 from alium/v5.6.4.2 Update for kernel 6.8	2024-03-15 23:11:21 +01:00
alium	88d0f5ca85	Update usb_intf.c for kernel 6.8	2024-03-12 07:14:38 +01:00
alium	d3feb6ae93	Update os_intfs.c for kernel 6.8	2024-03-12 07:11:35 +01:00
CamiKaseM7	c0d16813f5	Fix change_beacon for kernel 6.7	2024-01-16 03:44:34 -03:00