fix rtl8723cs compilation for kernel 6.8

This commit is contained in:
Paolo Sabatino
2024-03-25 15:00:10 +01:00
committed by Paolo
parent 69b06907ba
commit f63a98d082
2 changed files with 39 additions and 0 deletions

View File

@@ -521,6 +521,11 @@ driver_rtl8723cs() {
if linux-version compare "${version}" ge 6.7; then
process_patch_file "${SRC}/patch/misc/wireless-rtl8723cs/8723cs-Port-to-6.7.patch" "applying"
fi
if linux-version compare "${version}" ge 6.8; then
process_patch_file "${SRC}/patch/misc/wireless-rtl8723cs/8723cs-Port-to-6.8.patch" "applying"
fi
}

View File

@@ -0,0 +1,34 @@
diff --git a/drivers/staging/rtl8723cs/os_dep/linux/os_intfs.c b/drivers/staging/rtl8723cs/os_dep/linux/os_intfs.c
index 7fbce22c0842..4ac2cac55221 100644
--- a/drivers/staging/rtl8723cs/os_dep/linux/os_intfs.c
+++ b/drivers/staging/rtl8723cs/os_dep/linux/os_intfs.c
@@ -2025,13 +2025,13 @@ static void rtw_ethtool_get_drvinfo(struct net_device *dev, struct ethtool_drvin
wdev = dev->ieee80211_ptr;
if (wdev) {
- strlcpy(info->driver, wiphy_dev(wdev->wiphy)->driver->name,
+ strscpy(info->driver, wiphy_dev(wdev->wiphy)->driver->name,
sizeof(info->driver));
} else {
- strlcpy(info->driver, "N/A", sizeof(info->driver));
+ strscpy(info->driver, "N/A", sizeof(info->driver));
}
- strlcpy(info->version, DRIVERVERSION, sizeof(info->version));
+ strscpy(info->version, DRIVERVERSION, sizeof(info->version));
padapter = (_adapter *)rtw_netdev_priv(dev);
if (padapter) {
@@ -2042,10 +2042,10 @@ static void rtw_ethtool_get_drvinfo(struct net_device *dev, struct ethtool_drvin
scnprintf(info->fw_version, sizeof(info->fw_version), "%d.%d",
hal_data->firmware_version, hal_data->firmware_sub_version);
} else {
- strlcpy(info->fw_version, "N/A", sizeof(info->fw_version));
+ strscpy(info->fw_version, "N/A", sizeof(info->fw_version));
}
- strlcpy(info->bus_info, dev_name(wiphy_dev(wdev->wiphy)),
+ strscpy(info->bus_info, dev_name(wiphy_dev(wdev->wiphy)),
sizeof(info->bus_info));
}