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

Merge pull request #157 from misha4gps/main

Browse Source 
Added support of new kernel for rhel9.2
This commit is contained in:
morrownr 2023-06-08 17:42:25 -05:00 committed by GitHub
commit 2706b3fd9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@ -44,18 +44,27 @@ EXTRA_LDFLAGS += --strip-debug
CONFIG_AUTOCFG_CP = n
RHEL_VER := $(shell echo `grep '^ID_LIKE' /etc/os-release |grep -qi 'fedora' && grep '^VERSION_ID' /etc/os-release | cut -f2 -d= | cut -c2`)
ifeq (${RHEL_VER},8)
EXTRA_CFLAGS += -DRHEL8
ifdef RHEL_VER
ifdef KVER
RHEL_SVER := $(shell echo $(KVER) |sed -e 's/^[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*-\([0-9][0-9]*\).*/\1/')
else
RHEL_SVER := $(shell uname -r |sed -e 's/^[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*-\([0-9][0-9]*\).*/\1/')
endif
ifeq (${RHEL_VER},8)
EXTRA_CFLAGS += -DRHEL8
ifeq ($(shell test $(RHEL_SVER) -ge 477; echo $$?),0)
EXTRA_CFLAGS += -DRHEL88
endif
endif
ifeq (${RHEL_VER},9)
ifeq ($(shell test $(RHEL_SVER) -ge 284; echo $$?),0)
EXTRA_CFLAGS += -DRHEL92 -DRHEL88
endif
endif
endif
########################## WIFI IC ############################
CONFIG_MULTIDRV = n
CONFIG_RTL8188E = n
@ -1356,7 +1365,7 @@ endif
EXTRA_CFLAGS += -DDM_ODM_SUPPORT_TYPE=0x04
ifeq ($(CONFIG_RTW_MBO), y)
EXTRA_CFLAGS += -DCONFIG_RTW_MBO -DCONFIG_RTW_80211K -DCONFIG_RTW_WNM -DCONFIG_RTW_BTM_ROAM
EXTRA_CFLAGS += -DCONFIG_RTW_MBO -DCONFIG_RTW_WNM -DCONFIG_RTW_BTM_ROAM
EXTRA_CFLAGS += -DCONFIG_RTW_80211R
endif

2
core/rtw_mbo.c
View File

@ -534,7 +534,7 @@ static void rtw_mbo_non_pref_chans_set(
break;
}
} while(param != '\0');
} while(*param != '\0');
}

2
hal/hal_hci/hal_usb.c
View File

@ -26,7 +26,7 @@ int usb_init_recv_priv(_adapter *padapter, u16 ini_in_buf_sz)
#ifdef PLATFORM_LINUX
tasklet_init(&precvpriv->recv_tasklet,
#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0))
#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0) && !defined(RHEL92))
(void(*)(unsigned long))usb_recv_tasklet,
#else
(void *)usb_recv_tasklet,

2
hal/rtl8822b/usb/rtl8822bu_xmit.c
View File

@ -878,7 +878,7 @@ s32 rtl8822bu_init_xmit_priv(PADAPTER padapter)
#ifdef PLATFORM_LINUX
tasklet_init(&pxmitpriv->xmit_tasklet,
#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0))
#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0) && !defined(RHEL92))
(void(*)(unsigned long))rtl8822bu_xmit_tasklet,
#else
(void *)rtl8822bu_xmit_tasklet,

2
os_dep/osdep_service.c
View File

@ -1309,7 +1309,7 @@ u32 _rtw_down_sema(_sema *sema)
inline void thread_exit(_completion *comp)
{
#ifdef PLATFORM_LINUX
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0))
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0) || defined(RHEL92))
kthread_complete_and_exit(comp, 0);
#else
complete_and_exit(comp, 0);