skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2025-04-03 17:54:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #389 from fzuuzf/v4.1.8_9499

Browse source 
Fixes for 4.19 kernel and Makefile tweak
This commit is contained in:
lwfinger 2021-12-11 12:31:48 -06:00 • committed by GitHub
commit 5e453c775a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -100,7 +100,7 @@ endif
SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ | sed -e s/ppc/powerpc/ | sed -e s/armv.l/arm/) SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ | sed -e s/ppc/powerpc/ | sed -e s/armv.l/arm/)
ARCH ?= $(SUBARCH) ARCH ?= $(SUBARCH)
CROSS_COMPILE ?= CROSS_COMPILE ?=
KVER := $(shell uname -r) KVER ?= $(shell uname -r)
KERNEL_SRC ?= /lib/modules/$(KVER)/build KERNEL_SRC ?= /lib/modules/$(KVER)/build
MODDESTDIR := /lib/modules/$(KVER)/kernel/drivers/net/wireless/ MODDESTDIR := /lib/modules/$(KVER)/kernel/drivers/net/wireless/
INSTALL_PREFIX := INSTALL_PREFIX :=

2
os_dep/ioctl_cfg80211.c
View file

@ -4419,11 +4419,11 @@ static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy,
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
u16 frame_type; u16 frame_type;
bool reg = false; bool reg = false;
#endif
if (upd->global_stypes < 11) if (upd->global_stypes < 11)
frame_type = (u16)BIT(upd->global_stypes << 4); frame_type = (u16)BIT(upd->global_stypes << 4);
else else
frame_type = 0; frame_type = 0;
#endif
#ifdef CONFIG_DEBUG_CFG80211 #ifdef CONFIG_DEBUG_CFG80211
DBG_88E(FUNC_ADPT_FMT" frame_type:%x, reg:%d\n", FUNC_ADPT_ARG(adapter), DBG_88E(FUNC_ADPT_FMT" frame_type:%x, reg:%d\n", FUNC_ADPT_ARG(adapter),
frame_type, reg); frame_type, reg);

2
os_dep/rtw_android.c
View file

@ -356,7 +356,7 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd)
goto exit; goto exit;
} }
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 18, 0)) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0))
if (!access_ok(priv_cmd.buf, priv_cmd.total_len)) { if (!access_ok(priv_cmd.buf, priv_cmd.total_len)) {
#else #else
if (!access_ok(VERIFY_READ, (const void __user *)priv_cmd.buf, if (!access_ok(VERIFY_READ, (const void __user *)priv_cmd.buf,