From c9ca8f09317887dd506dd473fc57519381564a5b Mon Sep 17 00:00:00 2001 From: Ondrej Jirman Date: Sat, 27 Jan 2024 19:10:42 +0100 Subject: [PATCH 048/484] 8723cs: Port to Linux 6.8 Signed-off-by: Ondrej Jirman --- drivers/staging/rtl8723cs/os_dep/linux/os_intfs.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/staging/rtl8723cs/os_dep/linux/os_intfs.c b/drivers/staging/rtl8723cs/os_dep/linux/os_intfs.c index 7fbce22c0842..7f4e26d3a476 100644 --- a/drivers/staging/rtl8723cs/os_dep/linux/os_intfs.c +++ b/drivers/staging/rtl8723cs/os_dep/linux/os_intfs.c @@ -16,6 +16,7 @@ #include #include +#include MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Realtek Wireless Lan Driver"); @@ -2025,13 +2026,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 +2043,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)); } -- 2.49.0