minoplhy/88x2bu-20210702
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #216 from misha4gps/main

Browse Source 
Added rhel9.4 support
This commit is contained in:
morrownr 2024-05-11 13:13:08 -05:00 committed by GitHub
commit efab5593dc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -75,6 +75,9 @@ endif
ifeq ($(shell test $(RHEL_SVER) -ge 362; echo $$?),0) ifeq ($(shell test $(RHEL_SVER) -ge 362; echo $$?),0)
EXTRA_CFLAGS += -DRHEL89 EXTRA_CFLAGS += -DRHEL89
endif endif
ifeq ($(shell test $(RHEL_SVER) -ge 427; echo $$?),0)
EXTRA_CFLAGS += -DRHEL94
endif
endif endif
endif endif

6
os_dep/linux/ioctl_cfg80211.c
View File

@ -5405,7 +5405,7 @@ exit:
} }
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,
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 7, 0)) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 7, 0)) || defined(RHEL94)
struct cfg80211_ap_update *info) struct cfg80211_ap_update *info)
#else #else
struct cfg80211_beacon_data *info) struct cfg80211_beacon_data *info)
@ -5416,7 +5416,7 @@ static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *nd
RTW_INFO(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); RTW_INFO(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 7, 0)) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 7, 0)) || defined(RHEL94)
ret = rtw_add_beacon(adapter, info->beacon.head, info->beacon.head_len, info->beacon.tail, info->beacon.tail_len); ret = rtw_add_beacon(adapter, info->beacon.head, info->beacon.head_len, info->beacon.tail, info->beacon.tail_len);
#else #else
ret = rtw_add_beacon(adapter, info->head, info->head_len, info->tail, info->tail_len); ret = rtw_add_beacon(adapter, info->head, info->head_len, info->tail, info->tail_len);
@ -8455,7 +8455,7 @@ static int cfg80211_rtw_tdls_mgmt(struct wiphy *wiphy,
#else #else
u8 *peer, u8 *peer,
#endif #endif
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 5, 0)) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 5, 0)) || defined(RHEL94)
int link_id, int link_id,
#endif #endif
u8 action_code, u8 action_code,

2
os_dep/linux/wifi_regd.c
View File

@ -405,7 +405,7 @@ int rtw_regd_init(struct wiphy *wiphy)
wiphy->regulatory_flags &= ~REGULATORY_DISABLE_BEACON_HINTS; wiphy->regulatory_flags &= ~REGULATORY_DISABLE_BEACON_HINTS;
#endif #endif
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(6, 1, 39)) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(6, 1, 39)) && !defined(RHEL94)
wiphy->regulatory_flags |= REGULATORY_IGNORE_STALE_KICKOFF; wiphy->regulatory_flags |= REGULATORY_IGNORE_STALE_KICKOFF;
#endif #endif