Merge pull request #290 from luizluca/v5.3.9

Build support for kernel 6.10
This commit is contained in:
Christian kimo B.
2024-09-18 20:12:21 +02:00
committed by GitHub
2 changed files with 11 additions and 2 deletions

View File

@@ -417,7 +417,9 @@ u8 rtw_cfg80211_ch_switch_notify(_adapter *adapter, u8 ch, u8 bw, u8 offset, u8
if (ret != _SUCCESS) if (ret != _SUCCESS)
goto exit; goto exit;
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0)) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 9, 0))
cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0);
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0))
cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0, 0); cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0, 0);
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0)) #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0))
cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0); cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0);
@@ -4895,9 +4897,16 @@ exit:
return ret; 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 *ap_update)
{
struct cfg80211_beacon_data *info = &ap_update->beacon;
#else
static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *ndev, static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *ndev,
struct cfg80211_beacon_data *info) struct cfg80211_beacon_data *info)
{ {
#endif
int ret = 0; int ret = 0;
_adapter *adapter = (_adapter *)rtw_netdev_priv(ndev); _adapter *adapter = (_adapter *)rtw_netdev_priv(ndev);

View File

@@ -306,7 +306,7 @@ struct rtw_usb_drv usb_drv = {
.usbdrv.supports_autosuspend = 1, .usbdrv.supports_autosuspend = 1,
#endif #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, .usbdrv.drvwrap.driver.shutdown = rtw_dev_shutdown,
#else #else
.usbdrv.driver.shutdown = rtw_dev_shutdown, .usbdrv.driver.shutdown = rtw_dev_shutdown,