这是indexloc提供的服务，不要输入任何密码
Skip to content

Fix compilation with Linux 6.10 #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix compilation with Linux 6.10 #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions os_dep/linux/ioctl_cfg80211.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5394,8 +5394,15 @@ static int cfg80211_rtw_start_ap(struct wiphy *wiphy, struct net_device *ndev,
}

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

Expand Down
10 changes: 5 additions & 5 deletions os_dep/linux/os_intfs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2047,13 +2047,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) {
Expand All @@ -2064,10 +2064,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));
}

Expand Down
2 changes: 1 addition & 1 deletion os_dep/linux/usb_intf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ struct rtw_usb_drv usb_drv = {
.usbdrv.reset_resume = rtw_resume,
#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,
Expand Down
2 changes: 1 addition & 1 deletion os_dep/linux/wifi_regd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ int rtw_regd_init(struct wiphy *wiphy)
wiphy->regulatory_flags &= ~REGULATORY_DISABLE_BEACON_HINTS;
#endif

#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0))
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0) && LINUX_VERSION_CODE < KERNEL_VERSION(6, 5, 0))
wiphy->regulatory_flags |= REGULATORY_IGNORE_STALE_KICKOFF;
#endif

Expand Down