Merge pull request #193 from misha4gps/main

Added support for rhel8.9
This commit is contained in:
morrownr 2023-11-29 18:45:14 -06:00 committed by GitHub
commit e81b14fad1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions

View File

@ -61,6 +61,9 @@ EXTRA_CFLAGS += -DRHEL8
ifeq ($(shell test $(RHEL_SVER) -ge 477; echo $$?),0) ifeq ($(shell test $(RHEL_SVER) -ge 477; echo $$?),0)
EXTRA_CFLAGS += -DRHEL88 EXTRA_CFLAGS += -DRHEL88
endif endif
ifeq ($(shell test $(RHEL_SVER) -ge 513; echo $$?),0)
EXTRA_CFLAGS += -DRHEL89
endif
endif endif
ifeq (${RHEL_VER},9) ifeq (${RHEL_VER},9)
@ -68,7 +71,7 @@ ifeq ($(shell test $(RHEL_SVER) -ge 284; echo $$?),0)
EXTRA_CFLAGS += -DRHEL92 -DRHEL88 EXTRA_CFLAGS += -DRHEL92 -DRHEL88
endif endif
ifeq ($(shell test $(RHEL_SVER) -ge 362; echo $$?),0) ifeq ($(shell test $(RHEL_SVER) -ge 362; echo $$?),0)
EXTRA_CFLAGS += -DRHEL93 EXTRA_CFLAGS += -DRHEL89
endif endif
endif endif
endif endif

View File

@ -465,7 +465,7 @@ u8 rtw_cfg80211_ch_switch_notify(_adapter *adapter, u8 ch, u8 bw, u8 offset,
*/ */
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) || defined(RHEL88)) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) || defined(RHEL88))
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0) || defined(RHEL93)) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0) || defined(RHEL89))
cfg80211_ch_switch_started_notify(adapter->pnetdev, &chdef, 0, 0, false, 0); cfg80211_ch_switch_started_notify(adapter->pnetdev, &chdef, 0, 0, false, 0);
#else #else
cfg80211_ch_switch_started_notify(adapter->pnetdev, &chdef, 0, 0, false); cfg80211_ch_switch_started_notify(adapter->pnetdev, &chdef, 0, 0, false);
@ -484,7 +484,7 @@ u8 rtw_cfg80211_ch_switch_notify(_adapter *adapter, u8 ch, u8 bw, u8 offset,
goto exit; goto exit;
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 2) || defined(RHEL88)) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 2) || defined(RHEL88))
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0) || defined(RHEL93)) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0) || defined(RHEL89))
cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0, 0); cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0, 0);
#else #else
cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0); cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0);