mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-03-09 15:40:20 +00:00
Add alpha version for kernel 6.12 support
This commit is contained in:
parent
2d47118221
commit
6e713f6367
281 changed files with 65491 additions and 0 deletions
|
@ -0,0 +1,26 @@
|
|||
diff --git a/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c
|
||||
index 1dd0ff2a1a1abf..8537a93d6a8d2f 100644
|
||||
--- a/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c
|
||||
+++ b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c
|
||||
@@ -674,7 +674,11 @@ static void gpio_keys_irq_close(struct gpio_keys_button_dev *bdev)
|
||||
}
|
||||
}
|
||||
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
|
||||
static int gpio_keys_remove(struct platform_device *pdev)
|
||||
+#else
|
||||
+static void gpio_keys_remove(struct platform_device *pdev)
|
||||
+#endif
|
||||
{
|
||||
struct gpio_keys_button_dev *bdev = platform_get_drvdata(pdev);
|
||||
|
||||
@@ -685,7 +689,9 @@ static int gpio_keys_remove(struct platform_device *pdev)
|
||||
else
|
||||
gpio_keys_irq_close(bdev);
|
||||
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
|
||||
return 0;
|
||||
+#endif
|
||||
}
|
||||
|
||||
static struct platform_driver gpio_keys_driver = {
|
|
@ -0,0 +1,26 @@
|
|||
diff --git a/package/kernel/gpio-nct5104d/src/gpio-nct5104d.c b/package/kernel/gpio-nct5104d/src/gpio-nct5104d.c
|
||||
index eb1cf8494abe2..00dc4dcd9424f 100644
|
||||
--- a/package/kernel/gpio-nct5104d/src/gpio-nct5104d.c
|
||||
+++ b/package/kernel/gpio-nct5104d/src/gpio-nct5104d.c
|
||||
@@ -300,7 +300,11 @@ static int nct5104d_gpio_probe(struct platform_device *pdev)
|
||||
return err;
|
||||
}
|
||||
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
|
||||
static int nct5104d_gpio_remove(struct platform_device *pdev)
|
||||
+#else
|
||||
+static void nct5104d_gpio_remove(struct platform_device *pdev)
|
||||
+#endif
|
||||
{
|
||||
int i;
|
||||
struct nct5104d_gpio_data *data = platform_get_drvdata(pdev);
|
||||
@@ -311,7 +315,9 @@ static int nct5104d_gpio_remove(struct platform_device *pdev)
|
||||
gpiochip_remove (&bank->chip);
|
||||
}
|
||||
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6,11,0)
|
||||
return 0;
|
||||
+#endif
|
||||
}
|
||||
|
||||
static int __init nct5104d_find(int addr, struct nct5104d_sio *sio)
|
723
6.12/package/kernel/linux/modules/fs.mk
Normal file
723
6.12/package/kernel/linux/modules/fs.mk
Normal file
|
@ -0,0 +1,723 @@
|
|||
#
|
||||
# Copyright (C) 2006-2011 OpenWrt.org
|
||||
#
|
||||
# This is free software, licensed under the GNU General Public License v2.
|
||||
# See /LICENSE for more information.
|
||||
#
|
||||
|
||||
FS_MENU:=Filesystems
|
||||
|
||||
define KernelPackage/fs-9p
|
||||
SUBMENU:=$(FS_MENU)
|
||||
TITLE:=Plan 9 Resource Sharing Support
|
||||
DEPENDS:=+kmod-9pnet +LINUX_6_1:kmod-fs-netfs +LINUX_6_6:kmod-fs-netfs
|
||||
KCONFIG:=\
|
||||
CONFIG_9P_FS \
|
||||
CONFIG_9P_FS_POSIX_ACL=n \
|
||||
CONFIG_9P_FS_SECURITY=n \
|
||||
CONFIG_9P_FSCACHE=n
|
||||
FILES:=$(LINUX_DIR)/fs/9p/9p.ko
|
||||
AUTOLOAD:=$(call AutoLoad,30,9p)
|
||||
endef
|
||||
|
||||
define KernelPackage/fs-9p/description
|
||||
Kernel module for Plan 9 Resource Sharing Support support
|
||||
endef
|
||||
|
||||
$(eval $(call KernelPackage,fs-9p))
|
||||
|
||||
|
||||
define KernelPackage/fs-afs
|
||||
SUBMENU:=$(FS_MENU)
|
||||
TITLE:=Andrew FileSystem client
|
||||
DEFAULT:=n
|
||||
DEPENDS:=+kmod-rxrpc +kmod-dnsresolver +kmod-fs-fscache
|
||||
KCONFIG:=\
|
||||
CONFIG_AFS_FS=m \
|
||||
CONFIG_AFS_DEBUG=n \
|
||||
CONFIG_AFS_FSCACHE=y
|
||||
FILES:=$(LINUX_DIR)/fs/afs/kafs.ko
|
||||
AUTOLOAD:=$(call AutoLoad,30,kafs)
|
||||
endef
|
||||
|
||||
define KernelPackage/fs-afs/description
|
||||
Kernel module for Andrew FileSystem client support
|
||||
endef
|
||||
|
||||
$(eval $(call KernelPackage,fs-afs))
|
||||
|
||||
define KernelPackage/fs-autofs4
|
||||
SUBMENU:=$(FS_MENU)
|
||||
TITLE:=AUTOFS4 filesystem support
|
||||
KCONFIG:= \
|
||||
CONFIG_AUTOFS4_FS \
|
||||
CONFIG_AUTOFS_FS
|
||||
FILES:= \
|
||||
$(LINUX_DIR)/fs/autofs/autofs4.ko
|
||||
AUTOLOAD:=$(call AutoLoad,30,autofs4)
|
||||
endef
|
||||
|
||||
define KernelPackage/fs-autofs4/description
|
||||
Kernel module for AutoFS4 support
|
||||
endef
|
||||
|
||||
$(eval $(call KernelPackage,fs-autofs4))
|
||||
|
||||
|
||||
define KernelPackage/fs-btrfs
|
||||
SUBMENU:=$(FS_MENU)
|
||||
TITLE:=BTRFS filesystem support
|
||||
DEPENDS:=+kmod-lib-crc32c +kmod-lib-lzo +kmod-lib-zlib-inflate +kmod-lib-zlib-deflate +kmod-lib-raid6 +kmod-lib-xor +kmod-lib-zstd
|
||||
KCONFIG:=\
|
||||
CONFIG_BTRFS_FS \
|
||||
CONFIG_BTRFS_FS_CHECK_INTEGRITY=n
|
||||
FILES:=\
|
||||
$(LINUX_DIR)/fs/btrfs/btrfs.ko
|
||||
AUTOLOAD:=$(call AutoLoad,30,btrfs,1)
|
||||
endef
|
||||
|
||||
define KernelPackage/fs-btrfs/description
|
||||
Kernel module for BTRFS support
|
||||
endef
|
||||
|
||||
$(eval $(call KernelPackage,fs-btrfs))
|
||||
|
||||
|
||||
define KernelPackage/fs-smbfs-common
|
||||
SUBMENU:=$(FS_MENU)
|
||||
TITLE:=SMBFS common dependencies support
|
||||
HIDDEN:=1
|
||||
DEPENDS:=+LINUX_6_6:kmod-fs-netfs +LINUX_6_6:kmod-nls-ucs2-utils
|
||||
KCONFIG:=\
|
||||
CONFIG_SMBFS_COMMON@lt6.1 \
|
||||
CONFIG_SMBFS@ge6.1
|
||||
FILES:= \
|
||||
$(LINUX_DIR)/fs/smbfs_common/cifs_arc4.ko@lt6.1 \
|
||||
$(LINUX_DIR)/fs/smbfs_common/cifs_md4.ko@lt6.1 \
|
||||
$(LINUX_DIR)/fs/smb/common/cifs_arc4.ko@ge6.1 \
|
||||
$(LINUX_DIR)/fs/smb/common/cifs_md4.ko@ge6.1
|
||||
endef
|
||||
|
||||
define KernelPackage/fs-smbfs-common/description
|
||||
Kernel module dependency for CIFS or SMB_SERVER support
|
||||
endef
|
||||
|
||||
$(eval $(call KernelPackage,fs-smbfs-common))
|
||||
|
||||
|
||||
define KernelPackage/fs-cifs
|
||||
SUBMENU:=$(FS_MENU)
|
||||
TITLE:=CIFS support
|
||||
KCONFIG:= \
|
||||
CONFIG_CIFS \
|
||||
CONFIG_CIFS_DFS_UPCALL=n \
|
||||
CONFIG_CIFS_UPCALL=n
|
||||
FILES:= \
|
||||
$(LINUX_DIR)/fs/cifs/cifs.ko@lt6.1 \
|
||||
$(LINUX_DIR)/fs/smb/client/cifs.ko@ge6.1
|
||||
AUTOLOAD:=$(call AutoLoad,30,cifs)
|
||||
$(call AddDepends/nls)
|
||||
DEPENDS+= \
|
||||
+kmod-fs-smbfs-common \
|
||||
+kmod-crypto-md5 \
|
||||
+kmod-crypto-sha256 \
|
||||
+kmod-crypto-sha512 \
|
||||
+kmod-crypto-cmac \
|
||||
+kmod-crypto-hmac \
|
||||
+kmod-crypto-aead \
|
||||
+kmod-crypto-ccm \
|
||||
+kmod-crypto-ecb \
|
||||
+kmod-crypto-des \
|
||||
+kmod-asn1-decoder \
|
||||
+kmod-oid-registry \
|
||||
+kmod-dnsresolver
|
||||
endef
|
||||
|
||||
define KernelPackage/fs-cifs/description
|
||||
Kernel module for CIFS support
|
||||
endef
|
||||
|
||||
$(eval $(call KernelPackage,fs-cifs))
|
||||
|
||||
|
||||
define KernelPackage/fs-configfs
|
||||
SUBMENU:=$(FS_MENU)
|
||||
TITLE:=Configuration filesystem support
|
||||
KCONFIG:= \
|
||||
CONFIG_CONFIGFS_FS
|
||||
FILES:=$(LINUX_DIR)/fs/configfs/configfs.ko
|
||||
AUTOLOAD:=$(call AutoLoad,30,configfs)
|
||||
endef
|
||||
|
||||
define KernelPackage/fs-configfs/description
|
||||
Kernel module for configfs support
|
||||
endef
|
||||
|
||||
$(eval $(call KernelPackage,fs-configfs))
|
||||
|
||||
|
||||
define KernelPackage/fs-cramfs
|
||||
SUBMENU:=$(FS_MENU)
|
||||
TITLE:=Compressed RAM/ROM filesystem support
|
||||
DEPENDS:=+kmod-lib-zlib-inflate
|
||||
KCONFIG:= \
|
||||
CONFIG_CRAMFS
|
||||
FILES:=$(LINUX_DIR)/fs/cramfs/cramfs.ko
|
||||
AUTOLOAD:=$(call AutoLoad,30,cramfs)
|
||||
endef
|
||||
|
||||
define KernelPackage/fs-cramfs/description
|
||||
Kernel module for cramfs support
|
||||
endef
|
||||
|
||||
$(eval $(call KernelPackage,fs-cramfs))
|
||||
|
||||
|
||||
define KernelPackage/fs-efivarfs
|
||||
SUBMENU:=$(FS_MENU)
|
||||
TITLE:=efivar filesystem support
|
||||
KCONFIG:=CONFIG_EFIVAR_FS
|
||||
FILES:=$(LINUX_DIR)/fs/efivarfs/efivarfs.ko
|
||||
DEPENDS:=@(x86_64||x86)
|
||||
AUTOLOAD:=$(call Autoload,90,efivarfs)
|
||||
endef
|
||||
|
||||
define KernelPackage/fs-efivarfs/description
|
||||
Kernel module to support efivarfs file system mountpoint.
|
||||
endef
|
||||
|
||||
$(eval $(call KernelPackage,fs-efivarfs))
|
||||
|
||||
|
||||
define KernelPackage/fs-exfat
|
||||
SUBMENU:=$(FS_MENU)
|
||||
TITLE:=exFAT filesystem support
|
||||
KCONFIG:= \
|
||||
CONFIG_EXFAT_FS \
|
||||
CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
|
||||
FILES:= $(LINUX_DIR)/fs/exfat/exfat.ko
|
||||
AUTOLOAD:=$(call AutoLoad,30,exfat,1)
|
||||
DEPENDS:=+kmod-nls-base
|
||||
endef
|
||||
|
||||
define KernelPackage/fs-exfat/description
|
||||
Kernel module for exFAT filesystem support
|
||||
endef
|
||||
|
||||
$(eval $(call KernelPackage,fs-exfat))
|
||||
|
||||
|
||||
define KernelPackage/fs-exportfs
|
||||
SUBMENU:=$(FS_MENU)
|
||||
TITLE:=exportfs kernel server support
|
||||
KCONFIG:=CONFIG_EXPORTFS
|
||||
FILES=$(LINUX_DIR)/fs/exportfs/exportfs.ko
|
||||
AUTOLOAD:=$(call AutoLoad,20,exportfs,1)
|
||||
endef
|
||||
|
||||
define KernelPackage/fs-exportfs/description
|
||||
Kernel module for exportfs. Needed for some other modules.
|
||||
endef
|
||||
|
||||
$(eval $(call KernelPackage,fs-exportfs))
|
||||
|
||||
|
||||
define KernelPackage/fs-ext4
|
||||
SUBMENU:=$(FS_MENU)
|
||||
TITLE:=EXT4 filesystem support
|
||||
DEPENDS := \
|
||||
+kmod-lib-crc16 \
|
||||
+kmod-crypto-hash \
|
||||
+kmod-crypto-crc32c
|
||||
KCONFIG:= \
|
||||
CONFIG_EXT4_FS \
|
||||
CONFIG_EXT4_ENCRYPTION=n \
|
||||
CONFIG_JBD2
|
||||
FILES:= \
|
||||
$(LINUX_DIR)/fs/ext4/ext4.ko \
|
||||
$(LINUX_DIR)/fs/jbd2/jbd2.ko \
|
||||
$(LINUX_DIR)/fs/mbcache.ko
|
||||
AUTOLOAD:=$(call AutoLoad,30,mbcache jbd2 ext4,1)
|
||||
endef
|
||||
|
||||
define KernelPackage/fs-ext4/description
|
||||
Kernel module for EXT4 filesystem support
|
||||
endef
|
||||
|
||||
$(eval $(call KernelPackage,fs-ext4))
|
||||
|
||||
|
||||
define KernelPackage/fs-f2fs
|
||||
SUBMENU:=$(FS_MENU)
|
||||
TITLE:=F2FS filesystem support
|
||||
DEPENDS:= +kmod-crypto-hash +kmod-crypto-crc32 +kmod-nls-base
|
||||
KCONFIG:=CONFIG_F2FS_FS
|
||||
FILES:=$(LINUX_DIR)/fs/f2fs/f2fs.ko
|
||||
AUTOLOAD:=$(call AutoLoad,30,f2fs,1)
|
||||
endef
|
||||
|
||||
define KernelPackage/fs-f2fs/description
|
||||
Kernel module for F2FS filesystem support
|
||||
endef
|
||||
|
||||
$(eval $(call KernelPackage,fs-f2fs))
|
||||
|
||||
|
||||
#define KernelPackage/fs-fscache
|
||||
# SUBMENU:=$(FS_MENU)
|
||||
# TITLE:=General filesystem local cache manager
|
||||
# DEPENDS:=+kmod-fs-netfs
|
||||
# KCONFIG:=\
|
||||
# CONFIG_FSCACHE \
|
||||
# CONFIG_FSCACHE_STATS=y \
|
||||
# CONFIG_FSCACHE_HISTOGRAM=n \
|
||||
# CONFIG_FSCACHE_DEBUG=n \
|
||||
# CONFIG_FSCACHE_OBJECT_LIST=n \
|
||||
# CONFIG_CACHEFILES \
|
||||
# CONFIG_CACHEFILES_DEBUG=n \
|
||||
# CONFIG_CACHEFILES_HISTOGRAM=n \
|
||||
# CONFIG_CACHEFILES_ERROR_INJECTION=n@ge5.17 \
|
||||
# CONFIG_CACHEFILES_ONDEMAND=n@ge5.19
|
||||
# FILES:= \
|
||||
# $(LINUX_DIR)/fs/fscache/fscache.ko \
|
||||
# $(LINUX_DIR)/fs/cachefiles/cachefiles.ko
|
||||
# AUTOLOAD:=$(call AutoLoad,29,fscache cachefiles)
|
||||
#endef
|
||||
|
||||
#$(eval $(call KernelPackage,fs-fscache))
|
||||
|
||||
|
||||
define KernelPackage/fs-hfs
|
||||
SUBMENU:=$(FS_MENU)
|
||||
TITLE:=HFS filesystem support
|
||||
DEPENDS:=+kmod-cdrom
|
||||
KCONFIG:=CONFIG_HFS_FS
|
||||
FILES:=$(LINUX_DIR)/fs/hfs/hfs.ko
|
||||
AUTOLOAD:=$(call AutoLoad,30,hfs)
|
||||
$(call AddDepends/nls)
|
||||
endef
|
||||
|
||||
define KernelPackage/fs-hfs/description
|
||||
Kernel module for HFS filesystem support
|
||||
endef
|
||||
|
||||
$(eval $(call KernelPackage,fs-hfs))
|
||||
|
||||
|
||||
define KernelPackage/fs-hfsplus
|
||||
SUBMENU:=$(FS_MENU)
|
||||
TITLE:=HFS+ filesystem support
|
||||
DEPENDS:=+kmod-cdrom
|
||||
KCONFIG:=CONFIG_HFSPLUS_FS
|
||||
FILES:=$(LINUX_DIR)/fs/hfsplus/hfsplus.ko
|
||||
AUTOLOAD:=$(call AutoLoad,30,hfsplus)
|
||||
$(call AddDepends/nls,utf8)
|
||||
endef
|
||||
|
||||
define KernelPackage/fs-hfsplus/description
|
||||
Kernel module for HFS+ filesystem support
|
||||
endef
|
||||
|
||||
$(eval $(call KernelPackage,fs-hfsplus))
|
||||
|
||||
|
||||
define KernelPackage/fs-isofs
|
||||
SUBMENU:=$(FS_MENU)
|
||||
TITLE:=ISO9660 filesystem support
|
||||
DEPENDS:=+kmod-lib-zlib-inflate +kmod-cdrom
|
||||
KCONFIG:=CONFIG_ISO9660_FS CONFIG_JOLIET=y CONFIG_ZISOFS=n
|
||||
FILES:=$(LINUX_DIR)/fs/isofs/isofs.ko
|
||||
AUTOLOAD:=$(call AutoLoad,30,isofs)
|
||||
$(call AddDepends/nls)
|
||||
endef
|
||||
|
||||
define KernelPackage/fs-isofs/description
|
||||
Kernel module for ISO9660 filesystem support
|
||||
endef
|
||||
|
||||
$(eval $(call KernelPackage,fs-isofs))
|
||||
|
||||
|
||||
define KernelPackage/fs-jfs
|
||||
SUBMENU:=$(FS_MENU)
|
||||
TITLE:=JFS filesystem support
|
||||
KCONFIG:=CONFIG_JFS_FS
|
||||
FILES:=$(LINUX_DIR)/fs/jfs/jfs.ko
|
||||
AUTOLOAD:=$(call AutoLoad,30,jfs,1)
|
||||
DEPENDS:=+LINUX_6_6:kmod-nls-ucs2-utils
|
||||
$(call AddDepends/nls)
|
||||
endef
|
||||
|
||||
define KernelPackage/fs-jfs/description
|
||||
Kernel module for JFS support
|
||||
endef
|
||||
|
||||
$(eval $(call KernelPackage,fs-jfs))
|
||||
|
||||
|
||||
define KernelPackage/fs-ksmbd
|
||||
SUBMENU:=$(FS_MENU)
|
||||
TITLE:=SMB kernel server support
|
||||
DEPENDS:= \
|
||||
+kmod-nls-base \
|
||||
+kmod-nls-utf8 \
|
||||
+kmod-crypto-md5 \
|
||||
+kmod-crypto-hmac \
|
||||
+kmod-crypto-ecb \
|
||||
+kmod-crypto-des \
|
||||
+kmod-crypto-sha256 \
|
||||
+kmod-crypto-cmac \
|
||||
+kmod-crypto-sha512 \
|
||||
+kmod-crypto-aead \
|
||||
+kmod-crypto-ccm \
|
||||
+kmod-crypto-gcm \
|
||||
+kmod-asn1-decoder \
|
||||
+kmod-oid-registry \
|
||||
+kmod-fs-smbfs-common
|
||||
KCONFIG:= \
|
||||
CONFIG_SMB_SERVER \
|
||||
CONFIG_SMB_SERVER_SMBDIRECT=n \
|
||||
CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=n \
|
||||
CONFIG_SMB_SERVER_KERBEROS5=n
|
||||
FILES:= \
|
||||
$(LINUX_DIR)/fs/ksmbd/ksmbd.ko@lt6.1 \
|
||||
$(LINUX_DIR)/fs/smb/server/ksmbd.ko@ge6.1
|
||||
AUTOLOAD:=$(call AutoLoad,41,ksmbd)
|
||||
endef
|
||||
|
||||
define KernelPackage/fs-ksmbd/description
|
||||
Kernel module for SMB kernel server support
|
||||
endef
|
||||
|
||||
$(eval $(call KernelPackage,fs-ksmbd))
|
||||
|
||||
|
||||
define KernelPackage/fs-minix
|
||||
SUBMENU:=$(FS_MENU)
|
||||
TITLE:=Minix filesystem support
|
||||
KCONFIG:=CONFIG_MINIX_FS
|
||||
FILES:=$(LINUX_DIR)/fs/minix/minix.ko
|
||||
AUTOLOAD:=$(call AutoLoad,30,minix)
|
||||
endef
|
||||
|
||||
define KernelPackage/fs-minix/description
|
||||
Kernel module for Minix filesystem support
|
||||
endef
|
||||
|
||||
$(eval $(call KernelPackage,fs-minix))
|
||||
|
||||
|
||||
define KernelPackage/fs-msdos
|
||||
SUBMENU:=$(FS_MENU)
|
||||
TITLE:=MSDOS filesystem support
|
||||
DEPENDS:=+kmod-fs-vfat
|
||||
KCONFIG:=CONFIG_MSDOS_FS
|
||||
FILES:=$(LINUX_DIR)/fs/fat/msdos.ko
|
||||
AUTOLOAD:=$(call AutoLoad,40,msdos)
|
||||
$(call AddDepends/nls)
|
||||
endef
|
||||
|
||||
define KernelPackage/fs-msdos/description
|
||||
Kernel module for MSDOS filesystem support
|
||||
endef
|
||||
|
||||
$(eval $(call KernelPackage,fs-msdos))
|
||||
|
||||
|
||||
define KernelPackage/fs-netfs
|
||||
SUBMENU:=$(FS_MENU)
|
||||
TITLE:=Network Filesystems support
|
||||
KCONFIG:= CONFIG_NETFS_SUPPORT
|
||||
FILES:=$(LINUX_DIR)/fs/netfs/netfs.ko
|
||||
AUTOLOAD:=$(call AutoLoad,28,netfs)
|
||||
endef
|
||||
|
||||
$(eval $(call KernelPackage,fs-netfs))
|
||||
|
||||
|
||||
define KernelPackage/fs-nfs
|
||||
SUBMENU:=$(FS_MENU)
|
||||
TITLE:=NFS filesystem client support
|
||||
DEPENDS:=+kmod-fs-nfs-common +kmod-dnsresolver
|
||||
KCONFIG:= \
|
||||
CONFIG_NFS_FS \
|
||||
CONFIG_NFS_USE_LEGACY_DNS=n \
|
||||
CONFIG_NFS_USE_NEW_IDMAPPER=n
|
||||
FILES:= \
|
||||
$(LINUX_DIR)/fs/nfs/nfs.ko
|
||||
AUTOLOAD:=$(call AutoLoad,40,nfs)
|
||||
endef
|
||||
|
||||
define KernelPackage/fs-nfs/description
|
||||
Kernel module for NFS client support
|
||||
endef
|
||||
|
||||
$(eval $(call KernelPackage,fs-nfs))
|
||||
|
||||
|
||||
define KernelPackage/fs-nfs-common
|
||||
SUBMENU:=$(FS_MENU)
|
||||
TITLE:=Common NFS filesystem modules
|
||||
DEPENDS:=+kmod-oid-registry
|
||||
KCONFIG:= \
|
||||
CONFIG_LOCKD \
|
||||
CONFIG_SUNRPC \
|
||||
CONFIG_GRACE_PERIOD \
|
||||
CONFIG_NFS_V4=y \
|
||||
CONFIG_NFS_V4_1=y \
|
||||
CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" \
|
||||
CONFIG_NFS_V4_1_MIGRATION=n \
|
||||
CONFIG_NFS_V4_2=y \
|
||||
CONFIG_NFS_V4_2_READ_PLUS=n
|
||||
FILES:= \
|
||||
$(LINUX_DIR)/fs/lockd/lockd.ko \
|
||||
$(LINUX_DIR)/net/sunrpc/sunrpc.ko \
|
||||
$(LINUX_DIR)/fs/nfs_common/grace.ko
|
||||
AUTOLOAD:=$(call AutoLoad,30,grace sunrpc lockd)
|
||||
endef
|
||||
|
||||
$(eval $(call KernelPackage,fs-nfs-common))
|
||||
|
||||
|
||||
define KernelPackage/fs-nfs-common-rpcsec
|
||||
SUBMENU:=$(FS_MENU)
|
||||
TITLE:=NFS Secure RPC
|
||||
DEPENDS:= \
|
||||
+kmod-fs-nfs-common \
|
||||
+kmod-crypto-des \
|
||||
+kmod-crypto-cbc \
|
||||
+kmod-crypto-cts \
|
||||
+kmod-crypto-md5 \
|
||||
+kmod-crypto-sha1 \
|
||||
+kmod-crypto-hmac \
|
||||
+kmod-crypto-ecb \
|
||||
+kmod-crypto-arc4
|
||||
KCONFIG:= \
|
||||
CONFIG_SUNRPC_GSS \
|
||||
CONFIG_RPCSEC_GSS_KRB5
|
||||
FILES:= \
|
||||
$(LINUX_DIR)/net/sunrpc/auth_gss/auth_rpcgss.ko \
|
||||
$(LINUX_DIR)/net/sunrpc/auth_gss/rpcsec_gss_krb5.ko
|
||||
AUTOLOAD:=$(call AutoLoad,31,auth_rpcgss rpcsec_gss_krb5)
|
||||
endef
|
||||
|
||||
define KernelPackage/fs-nfs-common-rpcsec/description
|
||||
Kernel modules for NFS Secure RPC
|
||||
endef
|
||||
|
||||
$(eval $(call KernelPackage,fs-nfs-common-rpcsec))
|
||||
|
||||
|
||||
define KernelPackage/fs-nfs-v3
|
||||
SUBMENU:=$(FS_MENU)
|
||||
TITLE:=NFS3 filesystem client support
|
||||
DEPENDS:=+kmod-fs-nfs
|
||||
FILES:= \
|
||||
$(LINUX_DIR)/fs/nfs/nfsv3.ko
|
||||
AUTOLOAD:=$(call AutoLoad,41,nfsv3)
|
||||
endef
|
||||
|
||||
define KernelPackage/fs-nfs-v3/description
|
||||
Kernel module for NFS v3 client support
|
||||
endef
|
||||
|
||||
$(eval $(call KernelPackage,fs-nfs-v3))
|
||||
|
||||
|
||||
define KernelPackage/fs-nfs-v4
|
||||
SUBMENU:=$(FS_MENU)
|
||||
TITLE:=NFS4 filesystem client support
|
||||
DEPENDS:=+kmod-fs-nfs
|
||||
KCONFIG:= \
|
||||
CONFIG_NFS_V4=y
|
||||
FILES:= \
|
||||
$(LINUX_DIR)/fs/nfs/nfsv4.ko
|
||||
AUTOLOAD:=$(call AutoLoad,41,nfsv4)
|
||||
endef
|
||||
|
||||
define KernelPackage/fs-nfs-v4/description
|
||||
Kernel module for NFS v4 client support
|
||||
endef
|
||||
|
||||
$(eval $(call KernelPackage,fs-nfs-v4))
|
||||
|
||||
|
||||
define KernelPackage/fs-nfsd
|
||||
SUBMENU:=$(FS_MENU)
|
||||
TITLE:=NFS kernel server support
|
||||
DEPENDS:=+kmod-fs-nfs-common +kmod-fs-exportfs +kmod-fs-nfs-common-rpcsec
|
||||
KCONFIG:= \
|
||||
CONFIG_NFSD \
|
||||
CONFIG_NFSD_V4=y \
|
||||
CONFIG_NFSD_V4_SECURITY_LABEL=n \
|
||||
CONFIG_NFSD_BLOCKLAYOUT=n \
|
||||
CONFIG_NFSD_SCSILAYOUT=n \
|
||||
CONFIG_NFSD_FLEXFILELAYOUT=n \
|
||||
CONFIG_NFSD_FAULT_INJECTION=n \
|
||||
CONFIG_NFSD_V4_2_INTER_SSC=n
|
||||
FILES:=$(LINUX_DIR)/fs/nfsd/nfsd.ko
|
||||
AUTOLOAD:=$(call AutoLoad,40,nfsd)
|
||||
endef
|
||||
|
||||
define KernelPackage/fs-nfsd/description
|
||||
Kernel module for NFS kernel server support
|
||||
endef
|
||||
|
||||
$(eval $(call KernelPackage,fs-nfsd))
|
||||
|
||||
|
||||
#define KernelPackage/fs-ntfs
|
||||
# SUBMENU:=$(FS_MENU)
|
||||
# TITLE:=NTFS filesystem read-only (old driver) support
|
||||
# KCONFIG:=CONFIG_NTFS_FS
|
||||
# FILES:=$(LINUX_DIR)/fs/ntfs/ntfs.ko
|
||||
# AUTOLOAD:=$(call AutoLoad,30,ntfs)
|
||||
# $(call AddDepends/nls)
|
||||
#endef
|
||||
|
||||
#define KernelPackage/fs-ntfs/description
|
||||
# Kernel module for limited NTFS filesystem support. Support for writing
|
||||
# is extremely limited and disabled as a result.
|
||||
#endef
|
||||
|
||||
#$(eval $(call KernelPackage,fs-ntfs))
|
||||
|
||||
|
||||
define KernelPackage/fs-ntfs3
|
||||
SUBMENU:=$(FS_MENU)
|
||||
TITLE:=NTFS filesystem read & write (new driver) support
|
||||
KCONFIG:= CONFIG_NTFS3_FS CONFIG_NTFS3_FS_POSIX_ACL=y
|
||||
FILES:=$(LINUX_DIR)/fs/ntfs3/ntfs3.ko
|
||||
$(call AddDepends/nls)
|
||||
AUTOLOAD:=$(call AutoLoad,80,ntfs3)
|
||||
endef
|
||||
|
||||
define KernelPackage/fs-ntfs3/description
|
||||
Kernel module for fully functional NTFS filesystem support. It allows
|
||||
reading as well as writing.
|
||||
|
||||
It supports NTFS versions up to 3.1.
|
||||
endef
|
||||
|
||||
$(eval $(call KernelPackage,fs-ntfs3))
|
||||
|
||||
|
||||
define KernelPackage/fs-reiserfs
|
||||
SUBMENU:=$(FS_MENU)
|
||||
TITLE:=ReiserFS filesystem support
|
||||
KCONFIG:=CONFIG_REISERFS_FS
|
||||
FILES:=$(LINUX_DIR)/fs/reiserfs/reiserfs.ko
|
||||
AUTOLOAD:=$(call AutoLoad,30,reiserfs,1)
|
||||
endef
|
||||
|
||||
define KernelPackage/fs-reiserfs/description
|
||||
Kernel module for ReiserFS support
|
||||
endef
|
||||
|
||||
$(eval $(call KernelPackage,fs-reiserfs))
|
||||
|
||||
|
||||
define KernelPackage/fs-squashfs
|
||||
SUBMENU:=$(FS_MENU)
|
||||
TITLE:=SquashFS 4.0 filesystem support
|
||||
KCONFIG:=CONFIG_SQUASHFS \
|
||||
CONFIG_SQUASHFS_XZ=y
|
||||
FILES:=$(LINUX_DIR)/fs/squashfs/squashfs.ko
|
||||
AUTOLOAD:=$(call AutoLoad,30,squashfs,1)
|
||||
endef
|
||||
|
||||
define KernelPackage/fs-squashfs/description
|
||||
Kernel module for SquashFS 4.0 support
|
||||
endef
|
||||
|
||||
$(eval $(call KernelPackage,fs-squashfs))
|
||||
|
||||
|
||||
define KernelPackage/fs-udf
|
||||
SUBMENU:=$(FS_MENU)
|
||||
TITLE:=UDF filesystem support
|
||||
KCONFIG:=CONFIG_UDF_FS
|
||||
FILES:=$(LINUX_DIR)/fs/udf/udf.ko
|
||||
AUTOLOAD:=$(call AutoLoad,30,udf)
|
||||
DEPENDS:=+kmod-lib-crc-itu-t +kmod-cdrom
|
||||
$(call AddDepends/nls)
|
||||
endef
|
||||
|
||||
define KernelPackage/fs-udf/description
|
||||
Kernel module for UDF filesystem support
|
||||
endef
|
||||
|
||||
$(eval $(call KernelPackage,fs-udf))
|
||||
|
||||
|
||||
define KernelPackage/fs-vfat
|
||||
SUBMENU:=$(FS_MENU)
|
||||
TITLE:=VFAT filesystem support
|
||||
KCONFIG:= \
|
||||
CONFIG_FAT_FS \
|
||||
CONFIG_VFAT_FS
|
||||
FILES:= \
|
||||
$(LINUX_DIR)/fs/fat/fat.ko \
|
||||
$(LINUX_DIR)/fs/fat/vfat.ko
|
||||
AUTOLOAD:=$(call AutoLoad,30,fat vfat,1)
|
||||
$(call AddDepends/nls,cp437 iso8859-1 utf8)
|
||||
endef
|
||||
|
||||
define KernelPackage/fs-vfat/description
|
||||
Kernel module for VFAT filesystem support
|
||||
endef
|
||||
|
||||
$(eval $(call KernelPackage,fs-vfat))
|
||||
|
||||
|
||||
define KernelPackage/fs-xfs
|
||||
SUBMENU:=$(FS_MENU)
|
||||
TITLE:=XFS filesystem support
|
||||
KCONFIG:=CONFIG_XFS_FS
|
||||
DEPENDS:= +kmod-fs-exportfs +kmod-lib-crc32c
|
||||
FILES:=$(LINUX_DIR)/fs/xfs/xfs.ko
|
||||
AUTOLOAD:=$(call AutoLoad,30,xfs,1)
|
||||
endef
|
||||
|
||||
define KernelPackage/fs-xfs/description
|
||||
Kernel module for XFS support
|
||||
endef
|
||||
|
||||
$(eval $(call KernelPackage,fs-xfs))
|
||||
|
||||
|
||||
define KernelPackage/fuse
|
||||
SUBMENU:=$(FS_MENU)
|
||||
TITLE:=FUSE (Filesystem in Userspace) support
|
||||
KCONFIG:= CONFIG_FUSE_FS
|
||||
FILES:=$(LINUX_DIR)/fs/fuse/fuse.ko
|
||||
AUTOLOAD:=$(call AutoLoad,80,fuse)
|
||||
endef
|
||||
|
||||
define KernelPackage/fuse/description
|
||||
Kernel module for userspace filesystem support
|
||||
endef
|
||||
|
||||
$(eval $(call KernelPackage,fuse))
|
||||
|
||||
|
||||
define KernelPackage/pstore
|
||||
SUBMENU:=$(FS_MENU)
|
||||
TITLE:=Pstore file system
|
||||
DEFAULT:=m if ALL_KMODS
|
||||
KCONFIG:= \
|
||||
CONFIG_PSTORE \
|
||||
CONFIG_PSTORE_COMPRESS=y \
|
||||
CONFIG_PSTORE_COMPRESS_DEFAULT="deflate" \
|
||||
CONFIG_PSTORE_DEFLATE_COMPRESS=y \
|
||||
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
|
||||
FILES:= $(LINUX_DIR)/fs/pstore/pstore.ko
|
||||
AUTOLOAD:=$(call AutoLoad,30,pstore,1)
|
||||
DEPENDS:=+LINUX_6_6:kmod-lib-zlib-deflate +LINUX_6_6:kmod-lib-zlib-inflate
|
||||
endef
|
||||
|
||||
define KernelPackage/pstore/description
|
||||
Kernel module for pstore filesystem support
|
||||
endef
|
||||
|
||||
$(eval $(call KernelPackage,pstore))
|
1153
6.12/package/kernel/linux/modules/other.mk
Normal file
1153
6.12/package/kernel/linux/modules/other.mk
Normal file
File diff suppressed because it is too large
Load diff
1269
6.12/package/kernel/linux/modules/video.mk
Normal file
1269
6.12/package/kernel/linux/modules/video.mk
Normal file
File diff suppressed because it is too large
Load diff
|
@ -0,0 +1,403 @@
|
|||
--- a/drivers/net/wireless/ath/ath9k/channel.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/channel.c
|
||||
@@ -15,6 +15,7 @@
|
||||
*/
|
||||
|
||||
#include "ath9k.h"
|
||||
+#include "hsr.h"
|
||||
|
||||
/* Set/change channels. If the channel is really being changed, it's done
|
||||
* by reseting the chip. To accomplish this we must first cleanup any pending
|
||||
@@ -22,6 +23,7 @@
|
||||
*/
|
||||
static int ath_set_channel(struct ath_softc *sc)
|
||||
{
|
||||
+ struct device_node *np = sc->dev->of_node;
|
||||
struct ath_hw *ah = sc->sc_ah;
|
||||
struct ath_common *common = ath9k_hw_common(ah);
|
||||
struct ieee80211_hw *hw = sc->hw;
|
||||
@@ -42,6 +44,11 @@ static int ath_set_channel(struct ath_so
|
||||
ath_dbg(common, CONFIG, "Set channel: %d MHz width: %d\n",
|
||||
chan->center_freq, chandef->width);
|
||||
|
||||
+ if (of_property_read_bool(np, "ubnt,hsr")) {
|
||||
+ ath9k_hsr_enable(ah, chandef->width, chan->center_freq);
|
||||
+ ath9k_hsr_status(ah);
|
||||
+ }
|
||||
+
|
||||
/* update survey stats for the old channel before switching */
|
||||
spin_lock_irqsave(&common->cc_lock, flags);
|
||||
ath_update_survey_stats(sc);
|
||||
--- /dev/null
|
||||
+++ b/drivers/net/wireless/ath/ath9k/hsr.c
|
||||
@@ -0,0 +1,247 @@
|
||||
+/*
|
||||
+ *
|
||||
+ * The MIT License (MIT)
|
||||
+ *
|
||||
+ * Copyright (c) 2015 Kirill Berezin
|
||||
+ *
|
||||
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
+ * of this software and associated documentation files (the "Software"), to deal
|
||||
+ * in the Software without restriction, including without limitation the rights
|
||||
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
+ * copies of the Software, and to permit persons to whom the Software is
|
||||
+ * furnished to do so, subject to the following conditions:
|
||||
+ *
|
||||
+ * The above copyright notice and this permission notice shall be included in
|
||||
+ * all copies or substantial portions of the Software.
|
||||
+ *
|
||||
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
+ * SOFTWARE.
|
||||
+ *
|
||||
+ */
|
||||
+
|
||||
+#include <linux/io.h>
|
||||
+#include <linux/slab.h>
|
||||
+#include <linux/module.h>
|
||||
+#include <linux/time.h>
|
||||
+#include <linux/bitops.h>
|
||||
+#include <linux/etherdevice.h>
|
||||
+#include <linux/rtnetlink.h>
|
||||
+#include <linux/unaligned.h>
|
||||
+
|
||||
+#include "hw.h"
|
||||
+#include "ath9k.h"
|
||||
+
|
||||
+#define HSR_GPIO_CSN 8
|
||||
+#define HSR_GPIO_CLK 6
|
||||
+#define HSR_GPIO_DOUT 7
|
||||
+#define HSR_GPIO_DIN 5
|
||||
+
|
||||
+/* delays are in useconds */
|
||||
+#define HSR_DELAY_HALF_TICK 100
|
||||
+#define HSR_DELAY_PRE_WRITE 75
|
||||
+#define HSR_DELAY_FINAL 20000
|
||||
+#define HSR_DELAY_TRAILING 200
|
||||
+
|
||||
+void ath9k_hsr_init(struct ath_hw *ah)
|
||||
+{
|
||||
+ ath9k_hw_gpio_request_in(ah, HSR_GPIO_DIN, NULL);
|
||||
+ ath9k_hw_gpio_request_out(ah, HSR_GPIO_CSN, NULL,
|
||||
+ AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
|
||||
+ ath9k_hw_gpio_request_out(ah, HSR_GPIO_CLK, NULL,
|
||||
+ AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
|
||||
+ ath9k_hw_gpio_request_out(ah, HSR_GPIO_DOUT, NULL,
|
||||
+ AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
|
||||
+
|
||||
+ ath9k_hw_set_gpio(ah, HSR_GPIO_CSN, 1);
|
||||
+ ath9k_hw_set_gpio(ah, HSR_GPIO_CLK, 0);
|
||||
+ ath9k_hw_set_gpio(ah, HSR_GPIO_DOUT, 0);
|
||||
+
|
||||
+ udelay(HSR_DELAY_TRAILING);
|
||||
+}
|
||||
+
|
||||
+static u32 ath9k_hsr_write_byte(struct ath_hw *ah, int delay, u32 value)
|
||||
+{
|
||||
+ struct ath_common *common = ath9k_hw_common(ah);
|
||||
+ int i;
|
||||
+ u32 rval = 0;
|
||||
+
|
||||
+ udelay(delay);
|
||||
+
|
||||
+ ath9k_hw_set_gpio(ah, HSR_GPIO_CLK, 0);
|
||||
+ udelay(HSR_DELAY_HALF_TICK);
|
||||
+
|
||||
+ ath9k_hw_set_gpio(ah, HSR_GPIO_CSN, 0);
|
||||
+ udelay(HSR_DELAY_HALF_TICK);
|
||||
+
|
||||
+ for (i = 0; i < 8; ++i) {
|
||||
+ rval = rval << 1;
|
||||
+
|
||||
+ /* pattern is left to right, that is 7-th bit runs first */
|
||||
+ ath9k_hw_set_gpio(ah, HSR_GPIO_DOUT, (value >> (7 - i)) & 0x1);
|
||||
+ udelay(HSR_DELAY_HALF_TICK);
|
||||
+
|
||||
+ ath9k_hw_set_gpio(ah, HSR_GPIO_CLK, 1);
|
||||
+ udelay(HSR_DELAY_HALF_TICK);
|
||||
+
|
||||
+ rval |= ath9k_hw_gpio_get(ah, HSR_GPIO_DIN);
|
||||
+
|
||||
+ ath9k_hw_set_gpio(ah, HSR_GPIO_CLK, 0);
|
||||
+ udelay(HSR_DELAY_HALF_TICK);
|
||||
+ }
|
||||
+
|
||||
+ ath9k_hw_set_gpio(ah, HSR_GPIO_CSN, 1);
|
||||
+ udelay(HSR_DELAY_HALF_TICK);
|
||||
+
|
||||
+ ath_dbg(common, CONFIG, "ath9k_hsr_write_byte: write byte %d return value is %d %c\n",
|
||||
+ value, rval, rval > 32 ? rval : '-');
|
||||
+
|
||||
+ return rval & 0xff;
|
||||
+}
|
||||
+
|
||||
+static int ath9k_hsr_write_a_chain(struct ath_hw *ah, char *chain, int items)
|
||||
+{
|
||||
+ int status = 0;
|
||||
+ int i = 0;
|
||||
+ int err;
|
||||
+
|
||||
+ /* a preamble */
|
||||
+ ath9k_hsr_write_byte(ah, HSR_DELAY_PRE_WRITE, 0);
|
||||
+ status = ath9k_hsr_write_byte(ah, HSR_DELAY_PRE_WRITE, 0);
|
||||
+
|
||||
+ /* clear HSR's reply buffer */
|
||||
+ if (status) {
|
||||
+ int loop = 0;
|
||||
+
|
||||
+ for (loop = 0; (loop < 42) && status; ++loop)
|
||||
+ status = ath9k_hsr_write_byte(ah, HSR_DELAY_PRE_WRITE,
|
||||
+ 0);
|
||||
+
|
||||
+ if (loop >= 42) {
|
||||
+ ATH_DBG_WARN(1,
|
||||
+ "ath9k_hsr_write_a_chain: can't clear an output buffer after a 42 cycles.\n");
|
||||
+ return -1;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ for (i = 0; (i < items) && (chain[i] != 0); ++i)
|
||||
+ ath9k_hsr_write_byte(ah, HSR_DELAY_PRE_WRITE, (u32)chain[i]);
|
||||
+
|
||||
+ ath9k_hsr_write_byte(ah, HSR_DELAY_PRE_WRITE, 0);
|
||||
+ mdelay(HSR_DELAY_FINAL / 1000);
|
||||
+
|
||||
+ /* reply */
|
||||
+ memset(chain, 0, items);
|
||||
+
|
||||
+ ath9k_hsr_write_byte(ah, HSR_DELAY_PRE_WRITE, 0);
|
||||
+ udelay(HSR_DELAY_TRAILING);
|
||||
+
|
||||
+ for (i = 0; i < (items - 1); ++i) {
|
||||
+ u32 ret;
|
||||
+
|
||||
+ ret = ath9k_hsr_write_byte(ah, HSR_DELAY_PRE_WRITE, 0);
|
||||
+ if (ret != 0)
|
||||
+ chain[i] = (char)ret;
|
||||
+ else
|
||||
+ break;
|
||||
+
|
||||
+ udelay(HSR_DELAY_TRAILING);
|
||||
+ }
|
||||
+
|
||||
+ if (i <= 1)
|
||||
+ return 0;
|
||||
+
|
||||
+ err = kstrtoint(chain + 1, 10, &i);
|
||||
+ if (err)
|
||||
+ return err;
|
||||
+
|
||||
+ return i;
|
||||
+}
|
||||
+
|
||||
+int ath9k_hsr_disable(struct ath_hw *ah)
|
||||
+{
|
||||
+ char cmd[10] = {'b', '4', '0', 0, 0, 0, 0, 0, 0, 0};
|
||||
+ int ret;
|
||||
+
|
||||
+ ret = ath9k_hsr_write_a_chain(ah, cmd, sizeof(cmd));
|
||||
+ if ((ret > 0) && (*cmd == 'B'))
|
||||
+ return 0;
|
||||
+
|
||||
+ return -1;
|
||||
+}
|
||||
+
|
||||
+int ath9k_hsr_enable(struct ath_hw *ah, int bw, int fq)
|
||||
+{
|
||||
+ char cmd[10];
|
||||
+ int ret;
|
||||
+
|
||||
+ /* Bandwidth argument is 0 sometimes. Assume default 802.11bgn
|
||||
+ * 20MHz on invalid values
|
||||
+ */
|
||||
+ if ((bw != 5) && (bw != 10) && (bw != 20) && (bw != 40))
|
||||
+ bw = 20;
|
||||
+
|
||||
+ memset(cmd, 0, sizeof(cmd));
|
||||
+ *cmd = 'b';
|
||||
+ snprintf(cmd + 1, 3, "%02d", bw);
|
||||
+
|
||||
+ ret = ath9k_hsr_write_a_chain(ah, cmd, sizeof(cmd));
|
||||
+ if ((*cmd != 'B') || (ret != bw)) {
|
||||
+ ATH_DBG_WARN(1,
|
||||
+ "ath9k_hsr_enable: failed changing bandwidth -> set (%d,%d) reply (%d, %d)\n",
|
||||
+ 'b', bw, *cmd, ret);
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ memset(cmd, 0, sizeof(cmd));
|
||||
+ *cmd = 'x';
|
||||
+ ret = ath9k_hsr_write_a_chain(ah, cmd, sizeof(cmd));
|
||||
+ if (*cmd != 'X') {
|
||||
+ ATH_DBG_WARN(1,
|
||||
+ "ath9k_hsr_enable: failed 'x' command -> reply (%d, %d)\n",
|
||||
+ *cmd, ret);
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ memset(cmd, 0, sizeof(cmd));
|
||||
+ *cmd = 'm';
|
||||
+ ret = ath9k_hsr_write_a_chain(ah, cmd, sizeof(cmd));
|
||||
+ if (*cmd != 'M') {
|
||||
+ ATH_DBG_WARN(1,
|
||||
+ "ath9k_hsr_enable: failed 'm' command -> reply (%d, %d)\n",
|
||||
+ *cmd, ret);
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ memset(cmd, 0, sizeof(cmd));
|
||||
+ *cmd = 'f';
|
||||
+ snprintf(cmd + 1, 6, "%05d", fq);
|
||||
+ ret = ath9k_hsr_write_a_chain(ah, cmd, sizeof(cmd));
|
||||
+ if ((*cmd != 'F') && (ret != fq)) {
|
||||
+ ATH_DBG_WARN(1,
|
||||
+ "ath9k_hsr_enable: failed set frequency -> reply (%d, %d)\n",
|
||||
+ *cmd, ret);
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+int ath9k_hsr_status(struct ath_hw *ah)
|
||||
+{
|
||||
+ char cmd[10] = {'s', 0, 0, 0, 0, 0, 0, 0, 0, 0};
|
||||
+ int ret;
|
||||
+
|
||||
+ ret = ath9k_hsr_write_a_chain(ah, cmd, sizeof(cmd));
|
||||
+ if (*cmd != 'S') {
|
||||
+ ATH_DBG_WARN(1, "ath9k_hsr_status: returned %d,%d\n", *cmd,
|
||||
+ ret);
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
--- /dev/null
|
||||
+++ b/drivers/net/wireless/ath/ath9k/hsr.h
|
||||
@@ -0,0 +1,48 @@
|
||||
+/*
|
||||
+ * The MIT License (MIT)
|
||||
+ *
|
||||
+ * Copyright (c) 2015 Kirill Berezin
|
||||
+ *
|
||||
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
+ * of this software and associated documentation files (the "Software"), to deal
|
||||
+ * in the Software without restriction, including without limitation the rights
|
||||
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
+ * copies of the Software, and to permit persons to whom the Software is
|
||||
+ * furnished to do so, subject to the following conditions:
|
||||
+ *
|
||||
+ * The above copyright notice and this permission notice shall be included in
|
||||
+ * all copies or substantial portions of the Software.
|
||||
+ *
|
||||
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
+ * SOFTWARE.
|
||||
+ */
|
||||
+
|
||||
+#ifndef HSR_H
|
||||
+#define HSR_H
|
||||
+
|
||||
+#ifdef CPTCFG_ATH9K_UBNTHSR
|
||||
+
|
||||
+void ath9k_hsr_init(struct ath_hw *ah);
|
||||
+int ath9k_hsr_disable(struct ath_hw *ah);
|
||||
+int ath9k_hsr_enable(struct ath_hw *ah, int bw, int fq);
|
||||
+int ath9k_hsr_status(struct ath_hw *ah);
|
||||
+
|
||||
+#else
|
||||
+static inline void ath9k_hsr_init(struct ath_hw *ah) {}
|
||||
+
|
||||
+static inline int ath9k_hsr_enable(struct ath_hw *ah, int bw, int fq)
|
||||
+{
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static inline int ath9k_hsr_disable(struct ath_hw *ah) { return 0; }
|
||||
+static inline int ath9k_hsr_status(struct ath_hw *ah) { return 0; }
|
||||
+
|
||||
+#endif
|
||||
+
|
||||
+#endif /* HSR_H */
|
||||
--- a/drivers/net/wireless/ath/ath9k/main.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/main.c
|
||||
@@ -18,6 +18,7 @@
|
||||
#include <linux/delay.h>
|
||||
#include "ath9k.h"
|
||||
#include "btcoex.h"
|
||||
+#include "hsr.h"
|
||||
|
||||
static void ath9k_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
|
||||
u32 queues, bool drop);
|
||||
@@ -658,6 +659,7 @@ void ath_reset_work(struct work_struct *
|
||||
static int ath9k_start(struct ieee80211_hw *hw)
|
||||
{
|
||||
struct ath_softc *sc = hw->priv;
|
||||
+ struct device_node *np = sc->dev->of_node;
|
||||
struct ath_hw *ah = sc->sc_ah;
|
||||
struct ath_common *common = ath9k_hw_common(ah);
|
||||
struct ieee80211_channel *curchan = sc->cur_chan->chandef.chan;
|
||||
@@ -736,6 +738,11 @@ static int ath9k_start(struct ieee80211_
|
||||
AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
|
||||
}
|
||||
|
||||
+ if (of_property_read_bool(np, "ubnt,hsr")) {
|
||||
+ ath9k_hsr_init(ah);
|
||||
+ ath9k_hsr_disable(ah);
|
||||
+ }
|
||||
+
|
||||
/*
|
||||
* Reset key cache to sane defaults (all entries cleared) instead of
|
||||
* semi-random values after suspend/resume.
|
||||
--- a/drivers/net/wireless/ath/ath9k/Makefile
|
||||
+++ b/drivers/net/wireless/ath/ath9k/Makefile
|
||||
@@ -17,6 +17,7 @@ ath9k-$(CPTCFG_ATH9K_DFS_CERTIFIED) += d
|
||||
ath9k-$(CPTCFG_ATH9K_TX99) += tx99.o
|
||||
ath9k-$(CPTCFG_ATH9K_WOW) += wow.o
|
||||
ath9k-$(CPTCFG_ATH9K_HWRNG) += rng.o
|
||||
+ath9k-$(CPTCFG_ATH9K_UBNTHSR) += hsr.o
|
||||
|
||||
ath9k-$(CPTCFG_ATH9K_DEBUGFS) += debug.o
|
||||
|
||||
--- a/local-symbols
|
||||
+++ b/local-symbols
|
||||
@@ -121,6 +121,7 @@ ATH9K_WOW=
|
||||
ATH9K_RFKILL=
|
||||
ATH9K_CHANNEL_CONTEXT=
|
||||
ATH9K_PCOEM=
|
||||
+ATH9K_UBNTHSR=
|
||||
ATH9K_PCI_NO_EEPROM=
|
||||
ATH9K_HTC=
|
||||
ATH9K_HTC_DEBUGFS=
|
||||
--- a/drivers/net/wireless/ath/ath9k/Kconfig
|
||||
+++ b/drivers/net/wireless/ath/ath9k/Kconfig
|
||||
@@ -58,6 +58,19 @@ config ATH9K_AHB
|
||||
Say Y, if you have a SoC with a compatible built-in
|
||||
wireless MAC. Say N if unsure.
|
||||
|
||||
+config ATH9K_UBNTHSR
|
||||
+ bool "Ubiquiti UniFi Outdoor Plus HSR support"
|
||||
+ depends on ATH9K
|
||||
+ ---help---
|
||||
+ This options enables code to control the HSR RF
|
||||
+ filter in the receive path of the Ubiquiti UniFi
|
||||
+ Outdoor Plus access point.
|
||||
+
|
||||
+ Say Y if you want to use the access point. The
|
||||
+ code will only be used if the device is detected,
|
||||
+ so it does not harm other setup other than occupying
|
||||
+ a bit of memory.
|
||||
+
|
||||
config ATH9K_DEBUGFS
|
||||
bool "Atheros ath9k debugging"
|
||||
depends on ATH9K && DEBUG_FS && MAC80211_DEBUGFS
|
|
@ -0,0 +1,11 @@
|
|||
--- a/drivers/net/wireless/ath/ath9k/gpio.c 2024-09-16 14:38:11.938379419 +0200
|
||||
+++ b/drivers/net/wireless/ath/ath9k/gpio.c 2024-09-16 14:38:30.390115635 +0200
|
||||
@@ -111,7 +111,7 @@
|
||||
gc->gchip.get = ath9k_gpio_pin_get;
|
||||
gc->gchip.set = ath9k_gpio_pin_set;
|
||||
|
||||
- if (gpiochip_add(&gc->gchip)) {
|
||||
+ if (gpiochip_add_data(&gc->gchip, NULL)) {
|
||||
kfree(gc);
|
||||
return;
|
||||
}
|
|
@ -0,0 +1,18 @@
|
|||
--- a/backport-include/linux/acpi_amd_wbrf.h 2024-09-13 14:55:36.816379630 +0200
|
||||
+++ b/backport-include/linux/acpi_amd_wbrf.h 2024-09-13 14:55:47.792224160 +0200
|
||||
@@ -7,9 +7,6 @@
|
||||
#ifndef _ACPI_AMD_WBRF_H
|
||||
#define _ACPI_AMD_WBRF_H
|
||||
|
||||
-#if LINUX_VERSION_IS_GEQ(6,8,0)
|
||||
-#include_next <linux/acpi_amd_wbrf.h>
|
||||
-#else
|
||||
#include <linux/device.h>
|
||||
#include <linux/notifier.h>
|
||||
|
||||
@@ -82,5 +79,4 @@
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
-#endif /* >=6,8,0 */
|
||||
#endif /* _ACPI_AMD_WBRF_H */
|
|
@ -0,0 +1,541 @@
|
|||
--- a/net/wireless/trace.h 2024-09-13 13:11:10.145025393 +0200
|
||||
+++ b/net/wireless/trace.h 2024-09-13 13:14:21.774308452 +0200
|
||||
@@ -372,7 +372,7 @@
|
||||
),
|
||||
TP_fast_assign(
|
||||
WIPHY_ASSIGN;
|
||||
- __assign_str(vir_intf_name, name ? name : "<noname>");
|
||||
+ __assign_str(vir_intf_name);
|
||||
__entry->type = type;
|
||||
),
|
||||
TP_printk(WIPHY_PR_FMT ", virtual intf name: %s, type: %d",
|
||||
--- a/net/mac80211/trace.h 2024-09-13 13:27:20.887264216 +0200
|
||||
+++ b/net/mac80211/trace.h 2024-09-13 13:29:33.057391014 +0200
|
||||
@@ -33,7 +33,7 @@
|
||||
__string(vif_name, sdata->name)
|
||||
#define VIF_ASSIGN __entry->vif_type = sdata->vif.type; __entry->sdata = sdata; \
|
||||
__entry->p2p = sdata->vif.p2p; \
|
||||
- __assign_str(vif_name, sdata->name)
|
||||
+ __assign_str(vif_name)
|
||||
#define VIF_PR_FMT " vif:%s(%d%s)"
|
||||
#define VIF_PR_ARG __get_str(vif_name), __entry->vif_type, __entry->p2p ? "/p2p" : ""
|
||||
|
||||
--- a/drivers/bus/mhi/host/trace.h 2024-09-13 13:31:32.207702337 +0200
|
||||
+++ b/drivers/bus/mhi/host/trace.h 2024-09-13 13:32:22.330991957 +0200
|
||||
@@ -103,7 +103,7 @@
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
- __assign_str(name, mhi_cntrl->mhi_dev->name);
|
||||
+ __assign_str(name);
|
||||
__entry->ch_num = mhi_chan->chan;
|
||||
__entry->wp = mhi_tre;
|
||||
__entry->tre_ptr = mhi_tre->ptr;
|
||||
@@ -131,7 +131,7 @@
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
- __assign_str(name, mhi_cntrl->mhi_dev->name);
|
||||
+ __assign_str(name);
|
||||
__entry->local_ee = mhi_cntrl->ee;
|
||||
__entry->state = mhi_cntrl->dev_state;
|
||||
__entry->dev_ee = dev_ee;
|
||||
@@ -158,7 +158,7 @@
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
- __assign_str(name, mhi_cntrl->mhi_dev->name);
|
||||
+ __assign_str(name);
|
||||
if (pm_state)
|
||||
pm_state = __fls(pm_state);
|
||||
__entry->pm_state = pm_state;
|
||||
@@ -184,7 +184,7 @@
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
- __assign_str(name, mhi_cntrl->mhi_dev->name);
|
||||
+ __assign_str(name);
|
||||
__entry->rp = rp;
|
||||
__entry->ptr = rp->ptr;
|
||||
__entry->dword0 = rp->dword[0];
|
||||
@@ -226,7 +226,7 @@
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
- __assign_str(name, mhi_cntrl->mhi_dev->name);
|
||||
+ __assign_str(name);
|
||||
__entry->ch_num = mhi_chan->chan;
|
||||
__entry->state = state;
|
||||
__entry->reason = reason;
|
||||
@@ -265,7 +265,7 @@
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
- __assign_str(name, mhi_cntrl->mhi_dev->name);
|
||||
+ __assign_str(name);
|
||||
__entry->state = state;
|
||||
),
|
||||
|
||||
--- a/drivers/net/wireless/ath/ath10k/trace.h 2024-09-13 13:31:32.087704038 +0200
|
||||
+++ b/drivers/net/wireless/ath/ath10k/trace.h 2024-09-13 13:35:37.760222205 +0200
|
||||
@@ -55,8 +55,8 @@
|
||||
__vstring(msg, vaf->fmt, vaf->va)
|
||||
),
|
||||
TP_fast_assign(
|
||||
- __assign_str(device, dev_name(ar->dev));
|
||||
- __assign_str(driver, dev_driver_string(ar->dev));
|
||||
+ __assign_str(device);
|
||||
+ __assign_str(driver);
|
||||
__assign_vstr(msg, vaf->fmt, vaf->va);
|
||||
),
|
||||
TP_printk(
|
||||
@@ -92,8 +92,8 @@
|
||||
__vstring(msg, vaf->fmt, vaf->va)
|
||||
),
|
||||
TP_fast_assign(
|
||||
- __assign_str(device, dev_name(ar->dev));
|
||||
- __assign_str(driver, dev_driver_string(ar->dev));
|
||||
+ __assign_str(device);
|
||||
+ __assign_str(driver);
|
||||
__entry->level = level;
|
||||
__assign_vstr(msg, vaf->fmt, vaf->va);
|
||||
),
|
||||
@@ -121,10 +121,10 @@
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
- __assign_str(device, dev_name(ar->dev));
|
||||
- __assign_str(driver, dev_driver_string(ar->dev));
|
||||
- __assign_str(msg, msg);
|
||||
- __assign_str(prefix, prefix);
|
||||
+ __assign_str(device);
|
||||
+ __assign_str(driver);
|
||||
+ __assign_str(msg);
|
||||
+ __assign_str(prefix);
|
||||
__entry->buf_len = buf_len;
|
||||
memcpy(__get_dynamic_array(buf), buf, buf_len);
|
||||
),
|
||||
@@ -152,8 +152,8 @@
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
- __assign_str(device, dev_name(ar->dev));
|
||||
- __assign_str(driver, dev_driver_string(ar->dev));
|
||||
+ __assign_str(device);
|
||||
+ __assign_str(driver);
|
||||
__entry->id = id;
|
||||
__entry->buf_len = buf_len;
|
||||
memcpy(__get_dynamic_array(buf), buf, buf_len);
|
||||
@@ -182,8 +182,8 @@
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
- __assign_str(device, dev_name(ar->dev));
|
||||
- __assign_str(driver, dev_driver_string(ar->dev));
|
||||
+ __assign_str(device);
|
||||
+ __assign_str(driver);
|
||||
__entry->id = id;
|
||||
__entry->buf_len = buf_len;
|
||||
memcpy(__get_dynamic_array(buf), buf, buf_len);
|
||||
@@ -211,8 +211,8 @@
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
- __assign_str(device, dev_name(ar->dev));
|
||||
- __assign_str(driver, dev_driver_string(ar->dev));
|
||||
+ __assign_str(device);
|
||||
+ __assign_str(driver);
|
||||
__entry->buf_len = buf_len;
|
||||
memcpy(__get_dynamic_array(buf), buf, buf_len);
|
||||
),
|
||||
@@ -239,8 +239,8 @@
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
- __assign_str(device, dev_name(ar->dev));
|
||||
- __assign_str(driver, dev_driver_string(ar->dev));
|
||||
+ __assign_str(device);
|
||||
+ __assign_str(driver);
|
||||
__entry->hw_type = ar->hw_rev;
|
||||
__entry->buf_len = buf_len;
|
||||
memcpy(__get_dynamic_array(buf), buf, buf_len);
|
||||
@@ -269,8 +269,8 @@
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
- __assign_str(device, dev_name(ar->dev));
|
||||
- __assign_str(driver, dev_driver_string(ar->dev));
|
||||
+ __assign_str(device);
|
||||
+ __assign_str(driver);
|
||||
__entry->hw_type = ar->hw_rev;
|
||||
__entry->buf_len = buf_len;
|
||||
memcpy(__get_dynamic_array(pktlog), buf, buf_len);
|
||||
@@ -301,8 +301,8 @@
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
- __assign_str(device, dev_name(ar->dev));
|
||||
- __assign_str(driver, dev_driver_string(ar->dev));
|
||||
+ __assign_str(device);
|
||||
+ __assign_str(driver);
|
||||
__entry->msdu_id = msdu_id;
|
||||
__entry->msdu_len = msdu_len;
|
||||
__entry->vdev_id = vdev_id;
|
||||
@@ -332,8 +332,8 @@
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
- __assign_str(device, dev_name(ar->dev));
|
||||
- __assign_str(driver, dev_driver_string(ar->dev));
|
||||
+ __assign_str(device);
|
||||
+ __assign_str(driver);
|
||||
__entry->msdu_id = msdu_id;
|
||||
),
|
||||
|
||||
@@ -358,8 +358,8 @@
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
- __assign_str(device, dev_name(ar->dev));
|
||||
- __assign_str(driver, dev_driver_string(ar->dev));
|
||||
+ __assign_str(device);
|
||||
+ __assign_str(driver);
|
||||
__entry->len = ath10k_frm_hdr_len(data, len);
|
||||
memcpy(__get_dynamic_array(data), data, __entry->len);
|
||||
),
|
||||
@@ -386,8 +386,8 @@
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
- __assign_str(device, dev_name(ar->dev));
|
||||
- __assign_str(driver, dev_driver_string(ar->dev));
|
||||
+ __assign_str(device);
|
||||
+ __assign_str(driver);
|
||||
__entry->len = len - ath10k_frm_hdr_len(data, len);
|
||||
memcpy(__get_dynamic_array(payload),
|
||||
data + ath10k_frm_hdr_len(data, len), __entry->len);
|
||||
@@ -435,8 +435,8 @@
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
- __assign_str(device, dev_name(ar->dev));
|
||||
- __assign_str(driver, dev_driver_string(ar->dev));
|
||||
+ __assign_str(device);
|
||||
+ __assign_str(driver);
|
||||
__entry->hw_type = ar->hw_rev;
|
||||
__entry->len = len;
|
||||
memcpy(__get_dynamic_array(rxdesc), data, len);
|
||||
@@ -472,8 +472,8 @@
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
- __assign_str(device, dev_name(ar->dev));
|
||||
- __assign_str(driver, dev_driver_string(ar->dev));
|
||||
+ __assign_str(device);
|
||||
+ __assign_str(driver);
|
||||
__entry->type = type;
|
||||
__entry->timestamp = timestamp;
|
||||
__entry->code = code;
|
||||
@@ -505,8 +505,8 @@
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
- __assign_str(device, dev_name(ar->dev));
|
||||
- __assign_str(driver, dev_driver_string(ar->dev));
|
||||
+ __assign_str(device);
|
||||
+ __assign_str(driver);
|
||||
__entry->len = len;
|
||||
memcpy(__get_dynamic_array(data), data, len);
|
||||
),
|
||||
--- a/drivers/net/wireless/ath/ath11k/trace.h 2024-09-13 13:31:32.047704605 +0200
|
||||
+++ b/drivers/net/wireless/ath/ath11k/trace.h 2024-09-13 13:37:29.026645264 +0200
|
||||
@@ -48,8 +48,8 @@
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
- __assign_str(device, dev_name(ar->ab->dev));
|
||||
- __assign_str(driver, dev_driver_string(ar->ab->dev));
|
||||
+ __assign_str(device);
|
||||
+ __assign_str(driver);
|
||||
__entry->buf_len = buf_len;
|
||||
__entry->pktlog_checksum = pktlog_checksum;
|
||||
memcpy(__get_dynamic_array(pktlog), buf, buf_len);
|
||||
@@ -77,8 +77,8 @@
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
- __assign_str(device, dev_name(ar->ab->dev));
|
||||
- __assign_str(driver, dev_driver_string(ar->ab->dev));
|
||||
+ __assign_str(device);
|
||||
+ __assign_str(driver);
|
||||
__entry->len = len;
|
||||
memcpy(__get_dynamic_array(ppdu), data, len);
|
||||
),
|
||||
@@ -105,8 +105,8 @@
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
- __assign_str(device, dev_name(ar->ab->dev));
|
||||
- __assign_str(driver, dev_driver_string(ar->ab->dev));
|
||||
+ __assign_str(device);
|
||||
+ __assign_str(driver);
|
||||
__entry->len = len;
|
||||
__entry->log_type = log_type;
|
||||
memcpy(__get_dynamic_array(rxdesc), data, len);
|
||||
@@ -130,8 +130,8 @@
|
||||
__vstring(msg, vaf->fmt, vaf->va)
|
||||
),
|
||||
TP_fast_assign(
|
||||
- __assign_str(device, dev_name(ab->dev));
|
||||
- __assign_str(driver, dev_driver_string(ab->dev));
|
||||
+ __assign_str(device);
|
||||
+ __assign_str(driver);
|
||||
__assign_vstr(msg, vaf->fmt, vaf->va);
|
||||
),
|
||||
TP_printk(
|
||||
@@ -171,8 +171,8 @@
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
- __assign_str(device, dev_name(ab->dev));
|
||||
- __assign_str(driver, dev_driver_string(ab->dev));
|
||||
+ __assign_str(device);
|
||||
+ __assign_str(driver);
|
||||
__entry->id = id;
|
||||
__entry->buf_len = buf_len;
|
||||
memcpy(__get_dynamic_array(buf), buf, buf_len);
|
||||
@@ -201,8 +201,8 @@
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
- __assign_str(device, dev_name(ab->dev));
|
||||
- __assign_str(driver, dev_driver_string(ab->dev));
|
||||
+ __assign_str(device);
|
||||
+ __assign_str(driver);
|
||||
__entry->id = id;
|
||||
__entry->buf_len = buf_len;
|
||||
memcpy(__get_dynamic_array(buf), buf, buf_len);
|
||||
@@ -230,8 +230,8 @@
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
- __assign_str(device, dev_name(ab->dev));
|
||||
- __assign_str(driver, dev_driver_string(ab->dev));
|
||||
+ __assign_str(device);
|
||||
+ __assign_str(driver);
|
||||
__entry->level = level;
|
||||
WARN_ON_ONCE(vsnprintf(__get_dynamic_array(msg),
|
||||
ATH11K_MSG_MAX, vaf->fmt,
|
||||
@@ -262,10 +262,10 @@
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
- __assign_str(device, dev_name(ab->dev));
|
||||
- __assign_str(driver, dev_driver_string(ab->dev));
|
||||
- __assign_str(msg, msg);
|
||||
- __assign_str(prefix, prefix);
|
||||
+ __assign_str(device);
|
||||
+ __assign_str(driver);
|
||||
+ __assign_str(msg);
|
||||
+ __assign_str(prefix);
|
||||
__entry->buf_len = buf_len;
|
||||
memcpy(__get_dynamic_array(buf), buf, buf_len);
|
||||
),
|
||||
@@ -292,8 +292,8 @@
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
- __assign_str(device, dev_name(ab->dev));
|
||||
- __assign_str(driver, dev_driver_string(ab->dev));
|
||||
+ __assign_str(device);
|
||||
+ __assign_str(driver);
|
||||
__entry->len = len;
|
||||
memcpy(__get_dynamic_array(data), data, len);
|
||||
),
|
||||
@@ -318,8 +318,8 @@
|
||||
__field(u32, peer_ps_timestamp)
|
||||
),
|
||||
|
||||
- TP_fast_assign(__assign_str(device, dev_name(ar->ab->dev));
|
||||
- __assign_str(driver, dev_driver_string(ar->ab->dev));
|
||||
+ TP_fast_assign(__assign_str(device);
|
||||
+ __assign_str(driver);
|
||||
memcpy(__get_dynamic_array(peer_addr), peer_addr,
|
||||
ETH_ALEN);
|
||||
__entry->peer_ps_state = peer_ps_state;
|
||||
--- a/drivers/net/wireless/ath/ath12k/trace.h 2024-09-13 13:31:32.071704265 +0200
|
||||
+++ b/drivers/net/wireless/ath/ath12k/trace.h 2024-09-13 13:38:04.682139931 +0200
|
||||
@@ -36,8 +36,8 @@
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
- __assign_str(device, dev_name(ar->ab->dev));
|
||||
- __assign_str(driver, dev_driver_string(ar->ab->dev));
|
||||
+ __assign_str(device);
|
||||
+ __assign_str(driver);
|
||||
__entry->buf_len = buf_len;
|
||||
__entry->pktlog_checksum = pktlog_checksum;
|
||||
memcpy(__get_dynamic_array(pktlog), buf, buf_len);
|
||||
@@ -73,8 +73,8 @@
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
- __assign_str(device, dev_name(ar->ab->dev));
|
||||
- __assign_str(driver, dev_driver_string(ar->ab->dev));
|
||||
+ __assign_str(device);
|
||||
+ __assign_str(driver);
|
||||
__entry->len = len;
|
||||
__entry->info = ar->pdev->timestamp.info;
|
||||
__entry->sync_tstmp_lo_us = ar->pdev->timestamp.sync_timestamp_hi_us;
|
||||
@@ -117,8 +117,8 @@
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
- __assign_str(device, dev_name(ar->ab->dev));
|
||||
- __assign_str(driver, dev_driver_string(ar->ab->dev));
|
||||
+ __assign_str(device);
|
||||
+ __assign_str(driver);
|
||||
__entry->len = len;
|
||||
__entry->type = type;
|
||||
__entry->info = ar->pdev->timestamp.info;
|
||||
@@ -153,8 +153,8 @@
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
- __assign_str(device, dev_name(ab->dev));
|
||||
- __assign_str(driver, dev_driver_string(ab->dev));
|
||||
+ __assign_str(device);
|
||||
+ __assign_str(driver);
|
||||
__entry->len = len;
|
||||
memcpy(__get_dynamic_array(data), data, len);
|
||||
),
|
||||
--- a/drivers/net/wireless/ath/ath6kl/trace.h 2024-09-13 13:31:32.079704151 +0200
|
||||
+++ b/drivers/net/wireless/ath/ath6kl/trace.h 2024-09-13 13:33:01.462437360 +0200
|
||||
@@ -304,8 +304,8 @@
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
- __assign_str(msg, msg);
|
||||
- __assign_str(prefix, prefix);
|
||||
+ __assign_str(msg);
|
||||
+ __assign_str(prefix);
|
||||
__entry->buf_len = buf_len;
|
||||
memcpy(__get_dynamic_array(buf), buf, buf_len);
|
||||
),
|
||||
--- a/drivers/net/wireless/ath/trace.h 2024-09-13 13:31:32.043704662 +0200
|
||||
+++ b/drivers/net/wireless/ath/trace.h 2024-09-13 13:44:05.849032491 +0200
|
||||
@@ -44,8 +44,8 @@
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
- __assign_str(device, wiphy_name(wiphy));
|
||||
- __assign_str(driver, KBUILD_MODNAME);
|
||||
+ __assign_str(device);
|
||||
+ __assign_str(driver);
|
||||
__assign_vstr(msg, vaf->fmt, vaf->va);
|
||||
),
|
||||
|
||||
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.h 2024-09-13 13:31:31.999705285 +0200
|
||||
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.h 2024-09-13 13:42:28.746405624 +0200
|
||||
@@ -41,7 +41,7 @@
|
||||
__vstring(msg, vaf->fmt, vaf->va)
|
||||
),
|
||||
TP_fast_assign(
|
||||
- __assign_str(func, func);
|
||||
+ __assign_str(func);
|
||||
__assign_vstr(msg, vaf->fmt, vaf->va);
|
||||
),
|
||||
TP_printk("%s: %s", __get_str(func), __get_str(msg))
|
||||
@@ -57,7 +57,7 @@
|
||||
),
|
||||
TP_fast_assign(
|
||||
__entry->level = level;
|
||||
- __assign_str(func, func);
|
||||
+ __assign_str(func);
|
||||
__assign_vstr(msg, vaf->fmt, vaf->va);
|
||||
),
|
||||
TP_printk("%s: %s", __get_str(func), __get_str(msg))
|
||||
--- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac.h 2024-09-13 13:31:32.011705114 +0200
|
||||
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac.h 2024-09-13 13:42:44.218186836 +0200
|
||||
@@ -81,7 +81,7 @@
|
||||
__field(u32, mask)
|
||||
),
|
||||
TP_fast_assign(
|
||||
- __assign_str(dev, dev_name(dev));
|
||||
+ __assign_str(dev);
|
||||
__entry->in_isr = in_isr;
|
||||
__entry->macintstatus = macintstatus;
|
||||
__entry->mask = mask;
|
||||
--- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h 2024-09-13 13:31:32.011705114 +0200
|
||||
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h 2024-09-13 13:42:52.242073370 +0200
|
||||
@@ -71,7 +71,7 @@
|
||||
),
|
||||
TP_fast_assign(
|
||||
__entry->level = level;
|
||||
- __assign_str(func, func);
|
||||
+ __assign_str(func);
|
||||
__assign_vstr(msg, vaf->fmt, vaf->va);
|
||||
),
|
||||
TP_printk("%s: %s", __get_str(func), __get_str(msg))
|
||||
--- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h 2024-09-13 13:31:32.011705114 +0200
|
||||
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h 2024-09-13 13:43:12.721783766 +0200
|
||||
@@ -31,7 +31,7 @@
|
||||
__dynamic_array(u8, txh, txh_len)
|
||||
),
|
||||
TP_fast_assign(
|
||||
- __assign_str(dev, dev_name(dev));
|
||||
+ __assign_str(dev);
|
||||
memcpy(__get_dynamic_array(txh), txh, txh_len);
|
||||
),
|
||||
TP_printk("[%s] txdesc", __get_str(dev))
|
||||
@@ -54,7 +54,7 @@
|
||||
__field(u16, ackphyrxsh)
|
||||
),
|
||||
TP_fast_assign(
|
||||
- __assign_str(dev, dev_name(dev));
|
||||
+ __assign_str(dev);
|
||||
__entry->framelen = framelen;
|
||||
__entry->frameid = frameid;
|
||||
__entry->status = status;
|
||||
@@ -85,7 +85,7 @@
|
||||
__field(u16, dma_len)
|
||||
),
|
||||
TP_fast_assign(
|
||||
- __assign_str(dev, dev_name(dev));
|
||||
+ __assign_str(dev);
|
||||
__entry->max_ampdu_len = max_ampdu_len;
|
||||
__entry->max_ampdu_frames = max_ampdu_frames;
|
||||
__entry->ampdu_len = ampdu_len;
|
||||
--- a/drivers/net/wireless/intel/iwlwifi/iwl-devtrace.h 2024-09-13 13:31:31.915706475 +0200
|
||||
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-devtrace.h 2024-09-13 13:41:47.314991509 +0200
|
||||
@@ -87,7 +87,7 @@
|
||||
#endif
|
||||
|
||||
#define DEV_ENTRY __string(dev, dev_name(dev))
|
||||
-#define DEV_ASSIGN __assign_str(dev, dev_name(dev))
|
||||
+#define DEV_ASSIGN __assign_str(dev)
|
||||
|
||||
#include "iwl-devtrace-io.h"
|
||||
#include "iwl-devtrace-ucode.h"
|
||||
--- a/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-msg.h 2024-09-13 13:31:31.915706475 +0200
|
||||
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-devtrace-msg.h 2024-09-13 13:41:36.363146379 +0200
|
||||
@@ -57,7 +57,7 @@
|
||||
),
|
||||
TP_fast_assign(
|
||||
__entry->level = level;
|
||||
- __assign_str(function, function);
|
||||
+ __assign_str(function);
|
||||
__assign_vstr(msg, vaf->fmt, vaf->va);
|
||||
),
|
||||
TP_printk("%s", __get_str(msg))
|
||||
--- a/include/trace/events/qrtr.h 2024-09-13 13:31:32.207702337 +0200
|
||||
+++ b/include/trace/events/qrtr.h 2024-09-13 13:39:51.068635354 +0200
|
||||
@@ -102,7 +102,7 @@
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
- __assign_str(ctrl_pkt_str, ctrl_pkt_str);
|
||||
+ __assign_str(ctrl_pkt_str);
|
||||
__entry->sq_node = sq_node;
|
||||
__entry->sq_port = sq_port;
|
||||
),
|
|
@ -0,0 +1,798 @@
|
|||
diff '--color=auto' -aurN a/backport-include/asm/unaligned.h b/backport-include/asm/unaligned.h
|
||||
--- a/backport-include/asm/unaligned.h 2024-10-08 14:34:12.163916078 +0200
|
||||
+++ b/backport-include/asm/unaligned.h 2024-10-08 14:35:43.894639195 +0200
|
||||
@@ -1,6 +1,6 @@
|
||||
#ifndef __BACKPORT_ASM_GENERIC_UNALIGNED_H
|
||||
#define __BACKPORT_ASM_GENERIC_UNALIGNED_H
|
||||
-#include_next <asm/unaligned.h>
|
||||
+#include_next <linux/unaligned.h>
|
||||
|
||||
#if LINUX_VERSION_IS_LESS(5,7,0)
|
||||
static inline u32 __get_unaligned_be24(const u8 *p)
|
||||
diff '--color=auto' -aurN a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
|
||||
--- a/drivers/net/usb/sierra_net.c 2024-10-08 14:34:12.107916857 +0200
|
||||
+++ b/drivers/net/usb/sierra_net.c 2024-10-08 14:35:43.982637970 +0200
|
||||
@@ -30,7 +30,7 @@
|
||||
#include <linux/usb/cdc.h>
|
||||
#include <net/ip.h>
|
||||
#include <net/udp.h>
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
#include <linux/usb/usbnet.h>
|
||||
|
||||
#define SWI_USB_REQUEST_GET_FW_ATTR 0x06
|
||||
diff '--color=auto' -aurN a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
|
||||
--- a/drivers/net/wireless/ath/ath5k/base.c 2024-10-08 14:34:12.155916189 +0200
|
||||
+++ b/drivers/net/wireless/ath/ath5k/base.c 2024-10-08 14:35:44.266634016 +0200
|
||||
@@ -59,7 +59,7 @@
|
||||
#include <net/cfg80211.h>
|
||||
#include <net/ieee80211_radiotap.h>
|
||||
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
|
||||
#include <net/mac80211.h>
|
||||
#include "base.h"
|
||||
diff '--color=auto' -aurN a/drivers/net/wireless/ath/ath5k/mac80211-ops.c b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
|
||||
--- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c 2024-10-08 14:34:12.155916189 +0200
|
||||
+++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c 2024-10-08 14:35:44.342632959 +0200
|
||||
@@ -44,7 +44,7 @@
|
||||
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||
|
||||
#include <net/mac80211.h>
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
|
||||
#include "ath5k.h"
|
||||
#include "base.h"
|
||||
diff '--color=auto' -aurN a/drivers/net/wireless/ath/ath5k/pcu.c b/drivers/net/wireless/ath/ath5k/pcu.c
|
||||
--- a/drivers/net/wireless/ath/ath5k/pcu.c 2024-10-08 14:34:12.155916189 +0200
|
||||
+++ b/drivers/net/wireless/ath/ath5k/pcu.c 2024-10-08 14:35:44.266634016 +0200
|
||||
@@ -24,7 +24,7 @@
|
||||
* Protocol Control Unit Functions *
|
||||
\*********************************/
|
||||
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
|
||||
#include "ath5k.h"
|
||||
#include "reg.h"
|
||||
diff '--color=auto' -aurN a/drivers/net/wireless/ath/ath5k/phy.c b/drivers/net/wireless/ath/ath5k/phy.c
|
||||
--- a/drivers/net/wireless/ath/ath5k/phy.c 2024-10-08 14:34:12.155916189 +0200
|
||||
+++ b/drivers/net/wireless/ath/ath5k/phy.c 2024-10-08 14:35:44.342632959 +0200
|
||||
@@ -27,7 +27,7 @@
|
||||
#include <linux/delay.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/sort.h>
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
|
||||
#include "ath5k.h"
|
||||
#include "reg.h"
|
||||
diff '--color=auto' -aurN a/drivers/net/wireless/ath/ath5k/reset.c b/drivers/net/wireless/ath/ath5k/reset.c
|
||||
--- a/drivers/net/wireless/ath/ath5k/reset.c 2024-10-08 14:34:12.155916189 +0200
|
||||
+++ b/drivers/net/wireless/ath/ath5k/reset.c 2024-10-08 14:35:44.266634016 +0200
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
|
||||
#include <linux/pci.h> /* To determine if a card is pci-e */
|
||||
#include <linux/log2.h>
|
||||
diff '--color=auto' -aurN a/drivers/net/wireless/ath/ath6kl/htc_mbox.c b/drivers/net/wireless/ath/ath6kl/htc_mbox.c
|
||||
--- a/drivers/net/wireless/ath/ath6kl/htc_mbox.c 2024-10-08 14:34:12.151916244 +0200
|
||||
+++ b/drivers/net/wireless/ath/ath6kl/htc_mbox.c 2024-10-08 14:35:44.038637190 +0200
|
||||
@@ -21,7 +21,7 @@
|
||||
#include "hif-ops.h"
|
||||
#include "trace.h"
|
||||
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
|
||||
#define CALC_TXRX_PADDED_LEN(dev, len) (__ALIGN_MASK((len), (dev)->block_mask))
|
||||
|
||||
diff '--color=auto' -aurN a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
|
||||
--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c 2024-10-08 14:34:12.151916244 +0200
|
||||
+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c 2024-10-08 14:35:44.190635074 +0200
|
||||
@@ -14,7 +14,7 @@
|
||||
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
#include <linux/kernel.h>
|
||||
#include "hw.h"
|
||||
#include "ar9003_phy.h"
|
||||
diff '--color=auto' -aurN a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c
|
||||
--- a/drivers/net/wireless/ath/ath9k/debug.c 2024-10-08 14:34:12.151916244 +0200
|
||||
+++ b/drivers/net/wireless/ath/ath9k/debug.c 2024-10-08 14:35:44.190635074 +0200
|
||||
@@ -17,7 +17,7 @@
|
||||
#include <linux/slab.h>
|
||||
#include <linux/vmalloc.h>
|
||||
#include <linux/export.h>
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
|
||||
#include "ath9k.h"
|
||||
|
||||
diff '--color=auto' -aurN a/drivers/net/wireless/ath/ath9k/eeprom_4k.c b/drivers/net/wireless/ath/ath9k/eeprom_4k.c
|
||||
--- a/drivers/net/wireless/ath/ath9k/eeprom_4k.c 2024-10-08 14:34:12.151916244 +0200
|
||||
+++ b/drivers/net/wireless/ath/ath9k/eeprom_4k.c 2024-10-08 14:35:44.266634016 +0200
|
||||
@@ -14,7 +14,7 @@
|
||||
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
#include "hw.h"
|
||||
#include "ar9002_phy.h"
|
||||
|
||||
diff '--color=auto' -aurN a/drivers/net/wireless/ath/ath9k/eeprom_9287.c b/drivers/net/wireless/ath/ath9k/eeprom_9287.c
|
||||
--- a/drivers/net/wireless/ath/ath9k/eeprom_9287.c 2024-10-08 14:34:12.151916244 +0200
|
||||
+++ b/drivers/net/wireless/ath/ath9k/eeprom_9287.c 2024-10-08 14:35:44.190635074 +0200
|
||||
@@ -14,7 +14,7 @@
|
||||
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
#include "hw.h"
|
||||
#include "ar9002_phy.h"
|
||||
|
||||
diff '--color=auto' -aurN a/drivers/net/wireless/ath/ath9k/eeprom_def.c b/drivers/net/wireless/ath/ath9k/eeprom_def.c
|
||||
--- a/drivers/net/wireless/ath/ath9k/eeprom_def.c 2024-10-08 14:34:12.151916244 +0200
|
||||
+++ b/drivers/net/wireless/ath/ath9k/eeprom_def.c 2024-10-08 14:35:44.190635074 +0200
|
||||
@@ -14,7 +14,7 @@
|
||||
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
#include "hw.h"
|
||||
#include "ar9002_phy.h"
|
||||
|
||||
diff '--color=auto' -aurN a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c
|
||||
--- a/drivers/net/wireless/ath/ath9k/hif_usb.c 2024-10-08 14:34:12.151916244 +0200
|
||||
+++ b/drivers/net/wireless/ath/ath9k/hif_usb.c 2024-10-08 14:35:44.190635074 +0200
|
||||
@@ -14,7 +14,7 @@
|
||||
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
#include "htc.h"
|
||||
|
||||
MODULE_FIRMWARE(HTC_7010_MODULE_FW);
|
||||
diff '--color=auto' -aurN a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
|
||||
--- a/drivers/net/wireless/ath/ath9k/hw.c 2024-10-08 14:34:12.151916244 +0200
|
||||
+++ b/drivers/net/wireless/ath/ath9k/hw.c 2024-10-08 14:35:44.106636244 +0200
|
||||
@@ -21,7 +21,7 @@
|
||||
#include <linux/bitops.h>
|
||||
#include <linux/etherdevice.h>
|
||||
#include <linux/gpio.h>
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
|
||||
#include "hw.h"
|
||||
#include "hw-ops.h"
|
||||
diff '--color=auto' -aurN a/drivers/net/wireless/ath/carl9170/mac.c b/drivers/net/wireless/ath/carl9170/mac.c
|
||||
--- a/drivers/net/wireless/ath/carl9170/mac.c 2024-10-08 14:34:12.151916244 +0200
|
||||
+++ b/drivers/net/wireless/ath/carl9170/mac.c 2024-10-08 14:35:44.106636244 +0200
|
||||
@@ -36,7 +36,7 @@
|
||||
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
|
||||
#include "carl9170.h"
|
||||
#include "cmd.h"
|
||||
diff '--color=auto' -aurN a/drivers/net/wireless/ath/hw.c b/drivers/net/wireless/ath/hw.c
|
||||
--- a/drivers/net/wireless/ath/hw.c 2024-10-08 14:34:12.143916356 +0200
|
||||
+++ b/drivers/net/wireless/ath/hw.c 2024-10-08 14:35:44.106636244 +0200
|
||||
@@ -15,7 +15,7 @@
|
||||
*/
|
||||
|
||||
#include <linux/export.h>
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
|
||||
#include "ath.h"
|
||||
#include "reg.h"
|
||||
diff '--color=auto' -aurN a/drivers/net/wireless/ath/key.c b/drivers/net/wireless/ath/key.c
|
||||
--- a/drivers/net/wireless/ath/key.c 2024-10-08 14:34:12.143916356 +0200
|
||||
+++ b/drivers/net/wireless/ath/key.c 2024-10-08 14:35:44.106636244 +0200
|
||||
@@ -16,7 +16,7 @@
|
||||
*/
|
||||
|
||||
#include <linux/export.h>
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
#include <net/mac80211.h>
|
||||
|
||||
#include "ath.h"
|
||||
diff '--color=auto' -aurN a/drivers/net/wireless/broadcom/b43/main.c b/drivers/net/wireless/broadcom/b43/main.c
|
||||
--- a/drivers/net/wireless/broadcom/b43/main.c 2024-10-08 14:34:12.131916523 +0200
|
||||
+++ b/drivers/net/wireless/broadcom/b43/main.c 2024-10-08 14:35:44.418631901 +0200
|
||||
@@ -30,7 +30,7 @@
|
||||
#include <linux/io.h>
|
||||
#include <linux/dma-mapping.h>
|
||||
#include <linux/slab.h>
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
|
||||
#include "b43.h"
|
||||
#include "main.h"
|
||||
diff '--color=auto' -aurN a/drivers/net/wireless/broadcom/b43legacy/main.c b/drivers/net/wireless/broadcom/b43legacy/main.c
|
||||
--- a/drivers/net/wireless/broadcom/b43legacy/main.c 2024-10-08 14:34:12.135916466 +0200
|
||||
+++ b/drivers/net/wireless/broadcom/b43legacy/main.c 2024-10-08 14:35:44.342632959 +0200
|
||||
@@ -27,7 +27,7 @@
|
||||
#include <linux/dma-mapping.h>
|
||||
#include <linux/slab.h>
|
||||
#include <net/dst.h>
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
|
||||
#include "b43legacy.h"
|
||||
#include "main.h"
|
||||
diff '--color=auto' -aurN a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.h
|
||||
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.h 2024-10-08 14:34:12.135916466 +0200
|
||||
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.h 2024-10-08 14:35:44.342632959 +0200
|
||||
@@ -7,7 +7,7 @@
|
||||
#ifndef FWEH_H_
|
||||
#define FWEH_H_
|
||||
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
#include <linux/skbuff.h>
|
||||
#include <linux/if_ether.h>
|
||||
#include <linux/if.h>
|
||||
diff '--color=auto' -aurN a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
|
||||
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c 2024-10-08 14:34:12.135916466 +0200
|
||||
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c 2024-10-08 14:35:44.418631901 +0200
|
||||
@@ -16,7 +16,7 @@
|
||||
#include <linux/kthread.h>
|
||||
#include <linux/io.h>
|
||||
#include <linux/random.h>
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
|
||||
#include <soc.h>
|
||||
#include <chipcommon.h>
|
||||
diff '--color=auto' -aurN a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
|
||||
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c 2024-10-08 14:34:12.131916523 +0200
|
||||
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c 2024-10-08 14:35:44.342632959 +0200
|
||||
@@ -23,7 +23,7 @@
|
||||
#include <linux/bcma/bcma.h>
|
||||
#include <linux/debugfs.h>
|
||||
#include <linux/vmalloc.h>
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
#include <defs.h>
|
||||
#include <brcmu_wifi.h>
|
||||
#include <brcmu_utils.h>
|
||||
diff '--color=auto' -aurN a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/xtlv.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/xtlv.c
|
||||
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/xtlv.c 2024-10-08 14:34:12.135916466 +0200
|
||||
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/xtlv.c 2024-10-08 14:35:44.342632959 +0200
|
||||
@@ -3,7 +3,7 @@
|
||||
* Copyright (c) 2019 Broadcom
|
||||
*/
|
||||
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
|
||||
#include <linux/math.h>
|
||||
#include <linux/string.h>
|
||||
diff '--color=auto' -aurN a/drivers/net/wireless/intel/iwlegacy/3945.c b/drivers/net/wireless/intel/iwlegacy/3945.c
|
||||
--- a/drivers/net/wireless/intel/iwlegacy/3945.c 2024-10-08 14:34:12.127916579 +0200
|
||||
+++ b/drivers/net/wireless/intel/iwlegacy/3945.c 2024-10-08 14:35:44.490630899 +0200
|
||||
@@ -20,7 +20,7 @@
|
||||
#include <linux/netdevice.h>
|
||||
#include <linux/firmware.h>
|
||||
#include <linux/etherdevice.h>
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
#include <net/mac80211.h>
|
||||
|
||||
#include "common.h"
|
||||
diff '--color=auto' -aurN a/drivers/net/wireless/intel/iwlegacy/4965.c b/drivers/net/wireless/intel/iwlegacy/4965.c
|
||||
--- a/drivers/net/wireless/intel/iwlegacy/4965.c 2024-10-08 14:34:12.127916579 +0200
|
||||
+++ b/drivers/net/wireless/intel/iwlegacy/4965.c 2024-10-08 14:35:44.490630899 +0200
|
||||
@@ -20,7 +20,7 @@
|
||||
#include <linux/units.h>
|
||||
#include <net/mac80211.h>
|
||||
#include <linux/etherdevice.h>
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
|
||||
#include "common.h"
|
||||
#include "4965.h"
|
||||
diff '--color=auto' -aurN a/drivers/net/wireless/intel/iwlwifi/dvm/led.c b/drivers/net/wireless/intel/iwlwifi/dvm/led.c
|
||||
--- a/drivers/net/wireless/intel/iwlwifi/dvm/led.c 2024-10-08 14:34:12.123916635 +0200
|
||||
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/led.c 2024-10-08 14:35:44.490630899 +0200
|
||||
@@ -13,7 +13,7 @@
|
||||
#include <linux/netdevice.h>
|
||||
#include <net/mac80211.h>
|
||||
#include <linux/etherdevice.h>
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
#include "iwl-io.h"
|
||||
#include "iwl-trans.h"
|
||||
#include "iwl-modparams.h"
|
||||
diff '--color=auto' -aurN a/drivers/net/wireless/intel/iwlwifi/dvm/rx.c b/drivers/net/wireless/intel/iwlwifi/dvm/rx.c
|
||||
--- a/drivers/net/wireless/intel/iwlwifi/dvm/rx.c 2024-10-08 14:34:12.123916635 +0200
|
||||
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/rx.c 2024-10-08 14:35:44.490630899 +0200
|
||||
@@ -13,7 +13,7 @@
|
||||
#include <linux/slab.h>
|
||||
#include <linux/sched.h>
|
||||
#include <net/mac80211.h>
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
|
||||
#include "iwl-trans.h"
|
||||
#include "iwl-io.h"
|
||||
diff '--color=auto' -aurN a/drivers/net/wireless/intel/iwlwifi/mvm/rx.c b/drivers/net/wireless/intel/iwlwifi/mvm/rx.c
|
||||
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rx.c 2024-10-08 14:34:12.123916635 +0200
|
||||
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rx.c 2024-10-08 14:35:44.490630899 +0200
|
||||
@@ -4,7 +4,7 @@
|
||||
* Copyright (C) 2013-2015 Intel Mobile Communications GmbH
|
||||
* Copyright (C) 2016-2017 Intel Deutschland GmbH
|
||||
*/
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
#include <linux/etherdevice.h>
|
||||
#include <linux/skbuff.h>
|
||||
#include "iwl-trans.h"
|
||||
diff '--color=auto' -aurN a/drivers/net/wireless/marvell/libertas/cfg.c b/drivers/net/wireless/marvell/libertas/cfg.c
|
||||
--- a/drivers/net/wireless/marvell/libertas/cfg.c 2024-10-08 14:34:12.127916579 +0200
|
||||
+++ b/drivers/net/wireless/marvell/libertas/cfg.c 2024-10-08 14:35:44.490630899 +0200
|
||||
@@ -15,7 +15,7 @@
|
||||
#include <linux/slab.h>
|
||||
#include <linux/ieee80211.h>
|
||||
#include <net/cfg80211.h>
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
|
||||
#include "decl.h"
|
||||
#include "cfg.h"
|
||||
diff '--color=auto' -aurN a/drivers/net/wireless/marvell/libertas/cmdresp.c b/drivers/net/wireless/marvell/libertas/cmdresp.c
|
||||
--- a/drivers/net/wireless/marvell/libertas/cmdresp.c 2024-10-08 14:34:12.127916579 +0200
|
||||
+++ b/drivers/net/wireless/marvell/libertas/cmdresp.c 2024-10-08 14:35:44.494630843 +0200
|
||||
@@ -8,7 +8,7 @@
|
||||
#include <linux/slab.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/sched.h>
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
#include <net/cfg80211.h>
|
||||
|
||||
#include "cfg.h"
|
||||
diff '--color=auto' -aurN a/drivers/net/wireless/marvell/mwifiex/cmdevt.c b/drivers/net/wireless/marvell/mwifiex/cmdevt.c
|
||||
--- a/drivers/net/wireless/marvell/mwifiex/cmdevt.c 2024-10-08 14:34:12.131916523 +0200
|
||||
+++ b/drivers/net/wireless/marvell/mwifiex/cmdevt.c 2024-10-08 14:35:44.490630899 +0200
|
||||
@@ -5,7 +5,7 @@
|
||||
* Copyright 2011-2020 NXP
|
||||
*/
|
||||
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
#include "decl.h"
|
||||
#include "ioctl.h"
|
||||
#include "util.h"
|
||||
diff '--color=auto' -aurN a/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c b/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c
|
||||
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c 2024-10-08 14:34:12.139916412 +0200
|
||||
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/eeprom.c 2024-10-08 14:35:44.494630843 +0200
|
||||
@@ -10,7 +10,7 @@
|
||||
#include <linux/mtd/mtd.h>
|
||||
#include <linux/mtd/partitions.h>
|
||||
#include <linux/etherdevice.h>
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
#include "mt76x0.h"
|
||||
#include "eeprom.h"
|
||||
#include "../mt76x02_phy.h"
|
||||
diff '--color=auto' -aurN a/drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.c b/drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.c
|
||||
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.c 2024-10-08 14:34:12.135916466 +0200
|
||||
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_eeprom.c 2024-10-08 14:35:44.494630843 +0200
|
||||
@@ -4,7 +4,7 @@
|
||||
* Copyright (C) 2018 Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
|
||||
*/
|
||||
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
|
||||
#include "mt76x02_eeprom.h"
|
||||
|
||||
diff '--color=auto' -aurN a/drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.c b/drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.c
|
||||
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.c 2024-10-08 14:34:12.139916412 +0200
|
||||
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.c 2024-10-08 14:35:44.494630843 +0200
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/of.h>
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
#include "mt76x2.h"
|
||||
#include "eeprom.h"
|
||||
|
||||
diff '--color=auto' -aurN a/drivers/net/wireless/mediatek/mt7601u/dma.h b/drivers/net/wireless/mediatek/mt7601u/dma.h
|
||||
--- a/drivers/net/wireless/mediatek/mt7601u/dma.h 2024-10-08 14:34:12.143916356 +0200
|
||||
+++ b/drivers/net/wireless/mediatek/mt7601u/dma.h 2024-10-08 14:35:44.494630843 +0200
|
||||
@@ -7,7 +7,7 @@
|
||||
#ifndef __MT7601U_DMA_H
|
||||
#define __MT7601U_DMA_H
|
||||
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
#include <linux/skbuff.h>
|
||||
|
||||
#define MT_DMA_HDR_LEN 4
|
||||
diff '--color=auto' -aurN a/drivers/net/wireless/mediatek/mt7601u/eeprom.c b/drivers/net/wireless/mediatek/mt7601u/eeprom.c
|
||||
--- a/drivers/net/wireless/mediatek/mt7601u/eeprom.c 2024-10-08 14:34:12.143916356 +0200
|
||||
+++ b/drivers/net/wireless/mediatek/mt7601u/eeprom.c 2024-10-08 14:35:44.494630843 +0200
|
||||
@@ -8,7 +8,7 @@
|
||||
#include <linux/mtd/mtd.h>
|
||||
#include <linux/mtd/partitions.h>
|
||||
#include <linux/etherdevice.h>
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
#include "mt7601u.h"
|
||||
#include "eeprom.h"
|
||||
#include "mac.h"
|
||||
diff '--color=auto' -aurN a/drivers/net/wireless/zydas/zd1211rw/zd_usb.c b/drivers/net/wireless/zydas/zd1211rw/zd_usb.c
|
||||
--- a/drivers/net/wireless/zydas/zd1211rw/zd_usb.c 2024-10-08 14:34:12.119916691 +0200
|
||||
+++ b/drivers/net/wireless/zydas/zd1211rw/zd_usb.c 2024-10-08 14:35:44.494630843 +0200
|
||||
@@ -17,7 +17,7 @@
|
||||
#include <linux/workqueue.h>
|
||||
#include <linux/module.h>
|
||||
#include <net/mac80211.h>
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
|
||||
#include "zd_def.h"
|
||||
#include "zd_mac.h"
|
||||
diff '--color=auto' -aurN a/drivers/staging/rtl8723bs/core/rtw_ap.c b/drivers/staging/rtl8723bs/core/rtw_ap.c
|
||||
--- a/drivers/staging/rtl8723bs/core/rtw_ap.c 2024-10-08 14:34:12.103916913 +0200
|
||||
+++ b/drivers/staging/rtl8723bs/core/rtw_ap.c 2024-10-08 14:35:44.666628449 +0200
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
#include <drv_types.h>
|
||||
#include <rtw_debug.h>
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
|
||||
void init_mlme_ap_info(struct adapter *padapter)
|
||||
{
|
||||
diff '--color=auto' -aurN a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c
|
||||
--- a/drivers/staging/rtl8723bs/core/rtw_ieee80211.c 2024-10-08 14:34:12.103916913 +0200
|
||||
+++ b/drivers/staging/rtl8723bs/core/rtw_ieee80211.c 2024-10-08 14:35:44.610629228 +0200
|
||||
@@ -8,7 +8,7 @@
|
||||
#include <drv_types.h>
|
||||
#include <rtw_debug.h>
|
||||
#include <linux/of.h>
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
|
||||
u8 RTW_WPA_OUI_TYPE[] = { 0x00, 0x50, 0xf2, 1 };
|
||||
u16 RTW_WPA_VERSION = 1;
|
||||
diff '--color=auto' -aurN a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
|
||||
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c 2024-10-08 14:34:12.103916913 +0200
|
||||
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c 2024-10-08 14:35:44.494630843 +0200
|
||||
@@ -9,7 +9,7 @@
|
||||
#include <rtw_wifi_regd.h>
|
||||
#include <hal_btcoex.h>
|
||||
#include <linux/kernel.h>
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
|
||||
static struct mlme_handler mlme_sta_tbl[] = {
|
||||
{WIFI_ASSOCREQ, "OnAssocReq", &OnAssocReq},
|
||||
diff '--color=auto' -aurN a/drivers/staging/rtl8723bs/core/rtw_recv.c b/drivers/staging/rtl8723bs/core/rtw_recv.c
|
||||
--- a/drivers/staging/rtl8723bs/core/rtw_recv.c 2024-10-08 14:34:12.103916913 +0200
|
||||
+++ b/drivers/staging/rtl8723bs/core/rtw_recv.c 2024-10-08 14:35:44.494630843 +0200
|
||||
@@ -9,7 +9,7 @@
|
||||
#include <linux/jiffies.h>
|
||||
#include <rtw_recv.h>
|
||||
#include <net/cfg80211.h>
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
|
||||
static u8 SNAP_ETH_TYPE_IPX[2] = {0x81, 0x37};
|
||||
static u8 SNAP_ETH_TYPE_APPLETALK_AARP[2] = {0x80, 0xf3};
|
||||
diff '--color=auto' -aurN a/drivers/staging/rtl8723bs/os_dep/recv_linux.c b/drivers/staging/rtl8723bs/os_dep/recv_linux.c
|
||||
--- a/drivers/staging/rtl8723bs/os_dep/recv_linux.c 2024-10-08 14:34:12.107916857 +0200
|
||||
+++ b/drivers/staging/rtl8723bs/os_dep/recv_linux.c 2024-10-08 14:35:44.494630843 +0200
|
||||
@@ -8,7 +8,7 @@
|
||||
#include <rtw_debug.h>
|
||||
#include <linux/jiffies.h>
|
||||
#include <net/cfg80211.h>
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
|
||||
void rtw_os_free_recvframe(union recv_frame *precvframe)
|
||||
{
|
||||
diff '--color=auto' -aurN a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c
|
||||
--- a/drivers/usb/class/cdc-wdm.c 2024-10-08 14:34:12.159916134 +0200
|
||||
+++ b/drivers/usb/class/cdc-wdm.c 2024-10-08 14:35:44.494630843 +0200
|
||||
@@ -26,7 +26,7 @@
|
||||
#include <linux/usb/cdc.h>
|
||||
#include <linux/wwan.h>
|
||||
#include <asm/byteorder.h>
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
#include <linux/usb/cdc-wdm.h>
|
||||
|
||||
#define DRIVER_AUTHOR "Oliver Neukum"
|
||||
diff '--color=auto' -aurN a/include/linux/ieee80211.h b/include/linux/ieee80211.h
|
||||
--- a/include/linux/ieee80211.h 2024-10-08 14:34:12.163916078 +0200
|
||||
+++ b/include/linux/ieee80211.h 2024-10-08 14:35:44.734627502 +0200
|
||||
@@ -20,7 +20,7 @@
|
||||
#include <linux/etherdevice.h>
|
||||
#include <linux/bitfield.h>
|
||||
#include <asm/byteorder.h>
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
|
||||
/*
|
||||
* DS bit usage
|
||||
diff '--color=auto' -aurN a/include/net/ieee80211_radiotap.h b/include/net/ieee80211_radiotap.h
|
||||
--- a/include/net/ieee80211_radiotap.h 2024-10-08 14:34:12.159916134 +0200
|
||||
+++ b/include/net/ieee80211_radiotap.h 2024-10-08 14:35:44.666628449 +0200
|
||||
@@ -18,7 +18,7 @@
|
||||
#define __RADIOTAP_H
|
||||
|
||||
#include <linux/kernel.h>
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
|
||||
/**
|
||||
* struct ieee80211_radiotap_header - base radiotap header
|
||||
diff '--color=auto' -aurN a/include/net/mac80211.h b/include/net/mac80211.h
|
||||
--- a/include/net/mac80211.h 2024-10-08 14:34:12.159916134 +0200
|
||||
+++ b/include/net/mac80211.h 2024-10-08 14:35:44.666628449 +0200
|
||||
@@ -22,7 +22,7 @@
|
||||
#include <net/cfg80211.h>
|
||||
#include <net/codel.h>
|
||||
#include <net/ieee80211_radiotap.h>
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
|
||||
/**
|
||||
* DOC: Introduction
|
||||
diff '--color=auto' -aurN a/net/mac80211/key.c b/net/mac80211/key.c
|
||||
--- a/net/mac80211/key.c 2024-10-08 14:34:12.103916913 +0200
|
||||
+++ b/net/mac80211/key.c 2024-10-08 14:35:44.734627502 +0200
|
||||
@@ -18,7 +18,7 @@
|
||||
#include <linux/slab.h>
|
||||
#include <linux/export.h>
|
||||
#include <net/mac80211.h>
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
#include "ieee80211_i.h"
|
||||
#include "driver-ops.h"
|
||||
#include "debugfs_key.h"
|
||||
diff '--color=auto' -aurN a/net/mac80211/mesh.c b/net/mac80211/mesh.c
|
||||
--- a/net/mac80211/mesh.c 2024-10-08 14:34:12.103916913 +0200
|
||||
+++ b/net/mac80211/mesh.c 2024-10-08 14:35:44.906625108 +0200
|
||||
@@ -7,7 +7,7 @@
|
||||
*/
|
||||
|
||||
#include <linux/slab.h>
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
#include "ieee80211_i.h"
|
||||
#include "mesh.h"
|
||||
#include "wme.h"
|
||||
diff '--color=auto' -aurN a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c
|
||||
--- a/net/mac80211/mesh_hwmp.c 2024-10-08 14:34:12.103916913 +0200
|
||||
+++ b/net/mac80211/mesh_hwmp.c 2024-10-08 14:35:44.906625108 +0200
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
#include <linux/slab.h>
|
||||
#include <linux/etherdevice.h>
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
#include "wme.h"
|
||||
#include "mesh.h"
|
||||
|
||||
diff '--color=auto' -aurN a/net/mac80211/michael.c b/net/mac80211/michael.c
|
||||
--- a/net/mac80211/michael.c 2024-10-08 14:34:12.103916913 +0200
|
||||
+++ b/net/mac80211/michael.c 2024-10-08 14:35:44.734627502 +0200
|
||||
@@ -6,7 +6,7 @@
|
||||
#include <linux/types.h>
|
||||
#include <linux/bitops.h>
|
||||
#include <linux/ieee80211.h>
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
|
||||
#include "michael.h"
|
||||
|
||||
diff '--color=auto' -aurN a/net/mac80211/mlme.c b/net/mac80211/mlme.c
|
||||
--- a/net/mac80211/mlme.c 2024-10-08 14:34:12.103916913 +0200
|
||||
+++ b/net/mac80211/mlme.c 2024-10-08 14:35:44.842625999 +0200
|
||||
@@ -23,7 +23,7 @@
|
||||
#include <linux/slab.h>
|
||||
#include <linux/export.h>
|
||||
#include <net/mac80211.h>
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
|
||||
#include "ieee80211_i.h"
|
||||
#include "driver-ops.h"
|
||||
diff '--color=auto' -aurN a/net/mac80211/ocb.c b/net/mac80211/ocb.c
|
||||
--- a/net/mac80211/ocb.c 2024-10-08 14:34:12.103916913 +0200
|
||||
+++ b/net/mac80211/ocb.c 2024-10-08 14:35:44.906625108 +0200
|
||||
@@ -16,7 +16,7 @@
|
||||
#include <linux/etherdevice.h>
|
||||
#include <linux/rtnetlink.h>
|
||||
#include <net/mac80211.h>
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
|
||||
#include "ieee80211_i.h"
|
||||
#include "driver-ops.h"
|
||||
diff '--color=auto' -aurN a/net/mac80211/rx.c b/net/mac80211/rx.c
|
||||
--- a/net/mac80211/rx.c 2024-10-08 14:34:12.099916968 +0200
|
||||
+++ b/net/mac80211/rx.c 2024-10-08 14:35:44.906625108 +0200
|
||||
@@ -22,7 +22,7 @@
|
||||
#include <kunit/visibility.h>
|
||||
#include <net/mac80211.h>
|
||||
#include <net/ieee80211_radiotap.h>
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
|
||||
#include "ieee80211_i.h"
|
||||
#include "driver-ops.h"
|
||||
diff '--color=auto' -aurN a/net/mac80211/status.c b/net/mac80211/status.c
|
||||
--- a/net/mac80211/status.c 2024-10-08 14:34:12.103916913 +0200
|
||||
+++ b/net/mac80211/status.c 2024-10-08 14:35:44.734627502 +0200
|
||||
@@ -11,7 +11,7 @@
|
||||
#include <linux/export.h>
|
||||
#include <linux/etherdevice.h>
|
||||
#include <net/mac80211.h>
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
#include "ieee80211_i.h"
|
||||
#include "rate.h"
|
||||
#include "mesh.h"
|
||||
diff '--color=auto' -aurN a/net/mac80211/tkip.c b/net/mac80211/tkip.c
|
||||
--- a/net/mac80211/tkip.c 2024-10-08 14:34:12.103916913 +0200
|
||||
+++ b/net/mac80211/tkip.c 2024-10-08 14:35:44.906625108 +0200
|
||||
@@ -9,7 +9,7 @@
|
||||
#include <linux/types.h>
|
||||
#include <linux/netdevice.h>
|
||||
#include <linux/export.h>
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
|
||||
#include <net/mac80211.h>
|
||||
#include "driver-ops.h"
|
||||
diff '--color=auto' -aurN a/net/mac80211/tx.c b/net/mac80211/tx.c
|
||||
--- a/net/mac80211/tx.c 2024-10-08 14:34:12.103916913 +0200
|
||||
+++ b/net/mac80211/tx.c 2024-10-08 14:35:44.734627502 +0200
|
||||
@@ -24,7 +24,7 @@
|
||||
#include <net/mac80211.h>
|
||||
#include <net/codel.h>
|
||||
#include <net/codel_impl.h>
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
#include <net/fq_impl.h>
|
||||
#include <net/gso.h>
|
||||
|
||||
diff '--color=auto' -aurN a/net/mac80211/wep.c b/net/mac80211/wep.c
|
||||
--- a/net/mac80211/wep.c 2024-10-08 14:34:12.103916913 +0200
|
||||
+++ b/net/mac80211/wep.c 2024-10-08 14:35:44.906625108 +0200
|
||||
@@ -16,7 +16,7 @@
|
||||
#include <linux/mm.h>
|
||||
#include <linux/scatterlist.h>
|
||||
#include <linux/slab.h>
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
|
||||
#include <net/mac80211.h>
|
||||
#include "ieee80211_i.h"
|
||||
diff '--color=auto' -aurN a/net/mac80211/wpa.c b/net/mac80211/wpa.c
|
||||
--- a/net/mac80211/wpa.c 2024-10-08 14:34:12.103916913 +0200
|
||||
+++ b/net/mac80211/wpa.c 2024-10-08 14:35:44.906625108 +0200
|
||||
@@ -12,7 +12,7 @@
|
||||
#include <linux/compiler.h>
|
||||
#include <linux/ieee80211.h>
|
||||
#include <linux/gfp.h>
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
#include <net/mac80211.h>
|
||||
#include <crypto/aes.h>
|
||||
#include <crypto/utils.h>
|
||||
diff '--color=auto' -aurN a/net/wireless/radiotap.c b/net/wireless/radiotap.c
|
||||
--- a/net/wireless/radiotap.c 2024-10-08 14:34:12.099916968 +0200
|
||||
+++ b/net/wireless/radiotap.c 2024-10-08 14:35:44.906625108 +0200
|
||||
@@ -18,7 +18,7 @@
|
||||
#include <linux/export.h>
|
||||
#include <net/cfg80211.h>
|
||||
#include <net/ieee80211_radiotap.h>
|
||||
-#include <asm/unaligned.h>
|
||||
+#include <linux/unaligned.h>
|
||||
|
||||
/* function prototypes and related defs are in include/net/cfg80211.h */
|
||||
|
||||
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c 2024-10-08 14:34:12.135916466 +0200
|
||||
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c 2024-10-08 14:55:42.245829406 +0200
|
||||
@@ -1184,7 +1184,6 @@
|
||||
|
||||
static const struct file_operations bus_reset_fops = {
|
||||
.open = simple_open,
|
||||
- .llseek = no_llseek,
|
||||
.write = bus_reset_write,
|
||||
};
|
||||
|
||||
--- a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c 2024-10-08 14:34:12.123916635 +0200
|
||||
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c 2024-10-08 14:56:04.293516668 +0200
|
||||
@@ -3490,7 +3490,6 @@
|
||||
}
|
||||
|
||||
const struct file_operations iwl_dbgfs_d3_test_ops = {
|
||||
- .llseek = no_llseek,
|
||||
.open = iwl_mvm_d3_test_open,
|
||||
.read = iwl_mvm_d3_test_read,
|
||||
.release = iwl_mvm_d3_test_release,
|
||||
diff '--color=auto' -aurN backports-6.9.9/net/wireless/core.c backports-6.9.9.old/net/wireless/core.c
|
||||
--- a/net/wireless/core.c 2024-10-08 15:14:57.293440176 +0200
|
||||
+++ b/net/wireless/core.c 2024-10-08 15:13:05.007033920 +0200
|
||||
@@ -165,11 +165,11 @@
|
||||
list_for_each_entry(wdev, &rdev->wiphy.wdev_list, list) {
|
||||
if (!wdev->netdev)
|
||||
continue;
|
||||
- wdev->netdev->features &= ~NETIF_F_NETNS_LOCAL;
|
||||
+ wdev->netdev->netns_local = false;
|
||||
err = dev_change_net_namespace(wdev->netdev, net, "wlan%d");
|
||||
if (err)
|
||||
break;
|
||||
- wdev->netdev->features |= NETIF_F_NETNS_LOCAL;
|
||||
+ wdev->netdev->netns_local = true;
|
||||
}
|
||||
|
||||
if (err) {
|
||||
@@ -181,11 +181,11 @@
|
||||
list) {
|
||||
if (!wdev->netdev)
|
||||
continue;
|
||||
- wdev->netdev->features &= ~NETIF_F_NETNS_LOCAL;
|
||||
+ wdev->netdev->netns_local = false;
|
||||
err = dev_change_net_namespace(wdev->netdev, net,
|
||||
"wlan%d");
|
||||
WARN_ON(err);
|
||||
- wdev->netdev->features |= NETIF_F_NETNS_LOCAL;
|
||||
+ wdev->netdev->netns_local = true;
|
||||
}
|
||||
|
||||
return err;
|
||||
@@ -1453,7 +1453,7 @@
|
||||
SET_NETDEV_DEVTYPE(dev, &wiphy_type);
|
||||
wdev->netdev = dev;
|
||||
/* can only change netns with wiphy */
|
||||
- dev->features |= NETIF_F_NETNS_LOCAL;
|
||||
+ dev->netns_local = true;
|
||||
|
||||
cfg80211_init_wdev(wdev);
|
||||
break;
|
||||
diff '--color=auto' -aurN backports-6.9.9.old/net/mac80211/rc80211_minstrel_ht_debugfs.c backports-6.9.9/net/mac80211/rc80211_minstrel_ht_debugfs.c
|
||||
--- a/net/mac80211/rc80211_minstrel_ht_debugfs.c 2024-10-08 15:38:18.745318805 +0200
|
||||
+++ b/net/mac80211/rc80211_minstrel_ht_debugfs.c 2024-10-08 15:38:44.340958803 +0200
|
||||
@@ -187,7 +187,6 @@
|
||||
.open = minstrel_ht_stats_open,
|
||||
.read = minstrel_stats_read,
|
||||
.release = minstrel_stats_release,
|
||||
- .llseek = no_llseek,
|
||||
};
|
||||
|
||||
static char *
|
||||
@@ -322,7 +322,6 @@
|
||||
.open = minstrel_ht_stats_csv_open,
|
||||
.read = minstrel_stats_read,
|
||||
.release = minstrel_stats_release,
|
||||
- .llseek = no_llseek,
|
||||
};
|
||||
|
||||
void
|
|
@ -0,0 +1,19 @@
|
|||
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.h 2024-07-03 20:09:49.622279338 +0200
|
||||
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.h 2024-07-03 20:10:26.157677785 +0200
|
||||
@@ -294,4 +294,5 @@
|
||||
unsigned short *rxwi_size);
|
||||
void rt2800_pre_reset_hw(struct rt2x00_dev *rt2x00dev);
|
||||
|
||||
+void rt6352_enable_pa_pin(struct rt2x00_dev *rt2x00dev, int enable);
|
||||
#endif /* RT2800LIB_H */
|
||||
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h 2024-11-05 16:54:09.625006944 +0100
|
||||
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h 2024-11-05 16:54:26.280764117 +0100
|
||||
@@ -1504,6 +1504,8 @@
|
||||
u32 *tx, u32 *tx_max, u32 *rx, u32 *rx_max);
|
||||
bool rt2x00mac_tx_frames_pending(struct ieee80211_hw *hw);
|
||||
|
||||
+int rt2x00lib_read_eeprom(struct rt2x00_dev *rt2x00dev);
|
||||
+
|
||||
/*
|
||||
* Driver allocation handlers.
|
||||
*/
|
|
@ -0,0 +1,38 @@
|
|||
--- a/debugfs.c 2024-09-06 11:08:19.656939190 +0200
|
||||
+++ b/debugfs.c 2024-09-06 11:09:04.772324072 +0200
|
||||
@@ -331,15 +331,19 @@
|
||||
size_t count, loff_t *ppos)
|
||||
{
|
||||
struct mwl_priv *priv = (struct mwl_priv *)file->private_data;
|
||||
+#if defined AARCH64
|
||||
struct pcie_priv *pcie_priv = priv->hif.priv;
|
||||
unsigned long flags;
|
||||
+#endif
|
||||
unsigned long page = get_zeroed_page(GFP_KERNEL);
|
||||
int tx_num = 4, rx_num = 4;
|
||||
char *p = (char *)page;
|
||||
int len = 0, size = PAGE_SIZE;
|
||||
ssize_t ret;
|
||||
const struct hostcmd_get_hw_spec *get_hw_spec;
|
||||
+#if defined AARCH64
|
||||
int i;
|
||||
+#endif
|
||||
|
||||
if (!p)
|
||||
return -ENOMEM;
|
||||
@@ -359,6 +359,7 @@
|
||||
len += scnprintf(p + len, size - len,
|
||||
"num_wcb: %d\n", le32_to_cpu(get_hw_spec->num_wcb));
|
||||
|
||||
+#if defined AARCH64
|
||||
if (priv->chip_type == MWL8864) {
|
||||
len += scnprintf(p + len, size - len,
|
||||
"-----------------------=> address| address|qlen|fw_desc_cnt\n");
|
||||
@@ -370,6 +371,7 @@
|
||||
"wcb_base[%2d]: %x => %8x|%8p|%4d|%d\n", i, get_hw_spec->wcb_base[i], *((unsigned int *)le32_to_cpu(get_hw_spec->wcb_base[i])),(void *)*((unsigned int *)le32_to_cpu(get_hw_spec->wcb_base[i])),skb_queue_len(&pcie_priv->txq[i + 1]),pcie_priv->fw_desc_cnt[i + 1]);
|
||||
spin_unlock_irqrestore(&pcie_priv->tx_desc_lock, flags);
|
||||
}
|
||||
+#endif
|
||||
|
||||
len += scnprintf(p + len, size - len,
|
||||
"num_mcast_addr: %X\n", le16_to_cpu(get_hw_spec->num_mcast_addr));
|
34
6.12/package/kernel/nat46/Makefile
Normal file
34
6.12/package/kernel/nat46/Makefile
Normal file
|
@ -0,0 +1,34 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
include $(INCLUDE_DIR)/kernel.mk
|
||||
|
||||
PKG_NAME:=nat46
|
||||
|
||||
PKG_SOURCE_URL:=https://github.com/ayourtch/nat46.git
|
||||
PKG_SOURCE_DATE:=2024-07-02
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_VERSION:=f367088db99c9235e16dea8164eb82cbd0d299ba
|
||||
|
||||
PKG_MAINTAINER:=Hans Dedecker <dedeckeh@gmail.com>
|
||||
PKG_LICENSE:=GPL-2.0
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
define KernelPackage/nat46
|
||||
DEPENDS:=@IPV6 +kmod-nf-conntrack6
|
||||
TITLE:=Stateless NAT46 translation kernel module
|
||||
SECTION:=kernel
|
||||
SUBMENU:=Network Support
|
||||
FILES:=$(PKG_BUILD_DIR)/nat46/modules/nat46.ko
|
||||
AUTOLOAD:=$(call AutoLoad,33,nat46)
|
||||
endef
|
||||
|
||||
include $(INCLUDE_DIR)/kernel-defaults.mk
|
||||
|
||||
define Build/Compile
|
||||
$(KERNEL_MAKE) M="$(PKG_BUILD_DIR)/nat46/modules" \
|
||||
MODFLAGS="-DMODULE -mlong-calls" \
|
||||
EXTRA_CFLAGS="-DNAT46_VERSION=\\\"$(PKG_SOURCE_VERSION)\\\"" \
|
||||
modules
|
||||
endef
|
||||
|
||||
$(eval $(call KernelPackage,nat46))
|
99
6.12/package/kernel/nat46/patches/001-fix-kernel-6.10.patch
Normal file
99
6.12/package/kernel/nat46/patches/001-fix-kernel-6.10.patch
Normal file
|
@ -0,0 +1,99 @@
|
|||
--- a/nat46/modules/nat46-netdev.c 2024-08-14 16:36:59.249437588 +0200
|
||||
+++ b/nat46/modules/nat46-netdev.c 2024-08-14 16:39:28.523016026 +0200
|
||||
@@ -193,7 +193,6 @@
|
||||
return NULL;
|
||||
}
|
||||
|
||||
- read_lock(&dev_base_lock);
|
||||
dev = first_net_device(net);
|
||||
while (dev) {
|
||||
if((0 == strcmp(dev->name, name)) && is_nat46(dev)) {
|
||||
@@ -205,7 +204,6 @@
|
||||
}
|
||||
dev = next_net_device(dev);
|
||||
}
|
||||
- read_unlock(&dev_base_lock);
|
||||
return out;
|
||||
}
|
||||
|
||||
@@ -300,7 +298,6 @@
|
||||
|
||||
void nat64_show_all_configs(struct net *net, struct seq_file *m) {
|
||||
struct net_device *dev;
|
||||
- read_lock(&dev_base_lock);
|
||||
dev = first_net_device(net);
|
||||
while (dev) {
|
||||
if(is_nat46(dev)) {
|
||||
@@ -323,7 +320,6 @@
|
||||
}
|
||||
dev = next_net_device(dev);
|
||||
}
|
||||
- read_unlock(&dev_base_lock);
|
||||
|
||||
}
|
||||
|
||||
@@ -331,7 +327,6 @@
|
||||
struct net_device *dev;
|
||||
struct net_device *nat46dev;
|
||||
do {
|
||||
- read_lock(&dev_base_lock);
|
||||
nat46dev = NULL;
|
||||
dev = first_net_device(net);
|
||||
while (dev) {
|
||||
@@ -340,7 +335,6 @@
|
||||
}
|
||||
dev = next_net_device(dev);
|
||||
}
|
||||
- read_unlock(&dev_base_lock);
|
||||
if(nat46dev) {
|
||||
nat46_netdev_destroy(nat46dev);
|
||||
}
|
||||
--- a/nat46/modules/nat46-netdev.h 2024-08-14 16:39:50.726655831 +0200
|
||||
+++ b/nat46/modules/nat46-netdev.h 2024-08-14 16:40:25.954084361 +0200
|
||||
@@ -25,4 +25,5 @@
|
||||
void nat64_show_all_configs(struct net *net, struct seq_file *m);
|
||||
void nat46_netdev_count_xmit(struct sk_buff *skb, struct net_device *dev);
|
||||
void *netdev_nat46_instance(struct net_device *dev);
|
||||
-
|
||||
+int nat46_netdev_create(struct net *net, char *basename, struct net_device **dev);
|
||||
+void nat46_netdev_destroy(struct net_device *dev);
|
||||
--- a/nat46/modules/nat46-core.h 2024-08-14 16:44:24.686211571 +0200
|
||||
+++ b/nat46/modules/nat46-core.h 2024-08-14 16:50:42.464086457 +0200
|
||||
@@ -82,4 +82,37 @@
|
||||
nat46_instance_t *alloc_nat46_instance(int npairs, nat46_instance_t *old, int from_ipair, int to_ipair, int remove_ipair);
|
||||
void release_nat46_instance(nat46_instance_t *nat46);
|
||||
|
||||
+void nat46debug_dump(nat46_instance_t *nat46, int level, void *addr, int len);
|
||||
+int try_parse_ipv6_prefix(struct in6_addr *pref, int *pref_len, char *arg);
|
||||
+int try_parse_ipv4_prefix(u32 *v4addr, int *pref_len, char *arg);
|
||||
+int try_parse_rule_arg(nat46_xlate_rule_t *rule, char *arg_name, char **ptail);
|
||||
+char *xlate_style_to_string(nat46_xlate_style_t style);
|
||||
+void xlate_v4_to_nat64(nat46_instance_t *nat46, nat46_xlate_rule_t *rule, void *pipv4, void *pipv6);
|
||||
+int xlate_nat64_to_v4(nat46_instance_t *nat46, nat46_xlate_rule_t *rule, void *pipv6, void *pipv4);
|
||||
+int xlate_map_v4_to_v6(nat46_instance_t *nat46, nat46_xlate_rule_t *rule, void *pipv4, void *pipv6, uint16_t *pl4id, int map_version);
|
||||
+int xlate_map_v6_to_v4(nat46_instance_t *nat46, nat46_xlate_rule_t *rule, void *pipv6, void *pipv4, int version);
|
||||
+int xlate_v4_to_v6(nat46_instance_t *nat46, nat46_xlate_rule_t *rule, void *pipv4, void *pipv6, uint16_t *pl4id);
|
||||
+int xlate_v6_to_v4(nat46_instance_t *nat46, nat46_xlate_rule_t *rule, void *pipv6, void *pipv4);
|
||||
+__sum16 csum16_upd(__sum16 csum, u16 old, u16 new);
|
||||
+__sum16 csum_tcpudp_remagic(__be32 saddr, __be32 daddr, u32 len, unsigned char proto, u16 csum);
|
||||
+__sum16 csum_ipv6_unmagic(nat46_instance_t *nat46, const struct in6_addr *saddr, const struct in6_addr *daddr, __u32 len, unsigned short proto, __sum16 csum);
|
||||
+void update_icmp6_type_code(nat46_instance_t *nat46, struct icmp6hdr *icmp6h, u8 type, u8 code);
|
||||
+u16 get_next_ip_id(void);
|
||||
+u16 fold_ipv6_frag_id(u32 v6id);
|
||||
+void *add_offset(void *ptr, u16 offset);
|
||||
+void *get_next_header_ptr6(void *pv6, int v6_len);
|
||||
+void fill_v4hdr_from_v6hdr(struct iphdr * iph, struct ipv6hdr *ip6h, __u32 v4saddr, __u32 v4daddr, __u16 id, __u16 frag_off, __u16 proto, int l3_payload_len);
|
||||
+u16 unchecksum16(void *p, int count, u16 csum);
|
||||
+u16 rechecksum16(void *p, int count, u16 csum);
|
||||
+int is_last_pair_in_group(nat46_xlate_rulepair_t *apair);
|
||||
+void pairs_xlate_v6_to_v4_inner(nat46_instance_t *nat46, struct ipv6hdr *ip6h, __u32 *pv4saddr, __u32 *pv4daddr);
|
||||
+int xlate_payload6_to4(nat46_instance_t *nat46, void *pv6, void *ptrans_hdr, int v6_len, u16 *ul_sum, int *ptailTruncSize);
|
||||
+u8 *icmp_parameter_ptr(struct icmphdr *icmph);
|
||||
+u32 *icmp6_parameter_ptr(struct icmp6hdr *icmp6h);
|
||||
+int ip6_input_not_interested(nat46_instance_t *nat46, struct ipv6hdr *ip6h, struct sk_buff *old_skb);
|
||||
+int pairs_xlate_v6_to_v4_outer(nat46_instance_t *nat46, struct ipv6hdr *ip6h, uint16_t proto, __u32 *pv4saddr, __u32 *pv4daddr);
|
||||
+void ip6_update_csum(struct sk_buff * skb, struct ipv6hdr * ip6hdr, int do_atomic_frag);
|
||||
+int ip4_input_not_interested(nat46_instance_t *nat46, struct iphdr *iph, struct sk_buff *old_skb);
|
||||
+int pairs_xlate_v4_to_v6_outer(nat46_instance_t *nat46, struct iphdr *hdr4, uint16_t *sport, uint16_t *dport, void *v6saddr, void *v6daddr);
|
||||
+int is_valid_nat46(nat46_instance_t *nat46);
|
||||
#endif
|
10
6.12/package/kernel/nat46/patches/002-fix-kernel-6.11.patch
Normal file
10
6.12/package/kernel/nat46/patches/002-fix-kernel-6.11.patch
Normal file
|
@ -0,0 +1,10 @@
|
|||
--- a/nat46/modules/nat46-netdev.c 2024-09-13 09:39:48.960815094 +0200
|
||||
+++ b/nat46/modules/nat46-netdev.c 2024-09-13 09:40:11.128500472 +0200
|
||||
@@ -110,7 +110,6 @@
|
||||
dev->hard_header_len = 0;
|
||||
dev->addr_len = 0;
|
||||
dev->mtu = 16384; /* iptables does reassembly. Rather than using ETH_DATA_LEN, let's try to get as much mileage as we can with the Linux stack */
|
||||
- dev->features = NETIF_F_NETNS_LOCAL;
|
||||
dev->flags = IFF_NOARP | IFF_POINTOPOINT;
|
||||
}
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
--- a/ubootenv-nvram.c
|
||||
+++ b/ubootenv-nvram.c
|
||||
@@ -13,6 +13,7 @@
|
||||
#include <linux/of.h>
|
||||
#include <linux/of_reserved_mem.h>
|
||||
#include <linux/platform_device.h>
|
||||
+#include <linux/version.h>
|
||||
|
||||
#define NAME "ubootenv"
|
||||
|
||||
@@ -132,18 +133,30 @@ static int ubootenv_probe(struct platfor
|
||||
return misc_register(&data->misc);
|
||||
}
|
||||
|
||||
-static int ubootenv_remove(struct platform_device *pdev)
|
||||
+static
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 11, 0)
|
||||
+int
|
||||
+#else
|
||||
+void
|
||||
+#endif
|
||||
+ubootenv_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct ubootenv_drvdata *data = platform_get_drvdata(pdev);
|
||||
|
||||
data->env = NULL;
|
||||
misc_deregister(&data->misc);
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 11, 0)
|
||||
return 0;
|
||||
+#endif
|
||||
}
|
||||
|
||||
static struct platform_driver ubootenv_driver = {
|
||||
.probe = ubootenv_probe,
|
||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 11, 0)
|
||||
.remove = ubootenv_remove,
|
||||
+#else
|
||||
+ .remove_new = ubootenv_remove,
|
||||
+#endif
|
||||
.driver = {
|
||||
.name = NAME,
|
||||
.owner = THIS_MODULE,
|
Loading…
Add table
Add a link
Reference in a new issue