mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-03-09 15:40:20 +00:00
fix
This commit is contained in:
parent
3da221e185
commit
aa949d5825
4 changed files with 61 additions and 82 deletions
|
@ -122,7 +122,6 @@ CONFIG_AEABI=y
|
||||||
# CONFIG_AHCI_IMX is not set
|
# CONFIG_AHCI_IMX is not set
|
||||||
# CONFIG_AHCI_MVEBU is not set
|
# CONFIG_AHCI_MVEBU is not set
|
||||||
# CONFIG_AHCI_QORIQ is not set
|
# CONFIG_AHCI_QORIQ is not set
|
||||||
# CONFIG_AHCI_XGENE is not set
|
|
||||||
CONFIG_AIO=y
|
CONFIG_AIO=y
|
||||||
# CONFIG_AIRO is not set
|
# CONFIG_AIRO is not set
|
||||||
# CONFIG_AIRO_CS is not set
|
# CONFIG_AIRO_CS is not set
|
||||||
|
@ -297,9 +296,6 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
|
||||||
# CONFIG_ARM64_64K_PAGES is not set
|
# CONFIG_ARM64_64K_PAGES is not set
|
||||||
# CONFIG_ARM64_CRYPTO is not set
|
# CONFIG_ARM64_CRYPTO is not set
|
||||||
# CONFIG_ARM64_ERRATUM_1024718 is not set
|
# CONFIG_ARM64_ERRATUM_1024718 is not set
|
||||||
# CONFIG_ARM64_ERRATUM_1165522 is not set
|
|
||||||
# CONFIG_ARM64_ERRATUM_1286807 is not set
|
|
||||||
# CONFIG_ARM64_ERRATUM_1418040 is not set
|
|
||||||
# CONFIG_ARM64_ERRATUM_1463225 is not set
|
# CONFIG_ARM64_ERRATUM_1463225 is not set
|
||||||
# CONFIG_ARM64_ERRATUM_1542419 is not set
|
# CONFIG_ARM64_ERRATUM_1542419 is not set
|
||||||
# CONFIG_ARM64_ERRATUM_819472 is not set
|
# CONFIG_ARM64_ERRATUM_819472 is not set
|
||||||
|
@ -313,7 +309,7 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
|
||||||
# CONFIG_ARM64_ERRATUM_858921 is not set
|
# CONFIG_ARM64_ERRATUM_858921 is not set
|
||||||
# CONFIG_ARM64_HW_AFDBM is not set
|
# CONFIG_ARM64_HW_AFDBM is not set
|
||||||
# CONFIG_ARM64_LSE_ATOMICS is not set
|
# CONFIG_ARM64_LSE_ATOMICS is not set
|
||||||
CONFIG_ARM64_MODULE_PLTS=y
|
# CONFIG_ARM64_MODULE_PLTS is not set
|
||||||
# CONFIG_ARM64_PAN is not set
|
# CONFIG_ARM64_PAN is not set
|
||||||
# CONFIG_ARM64_PMEM is not set
|
# CONFIG_ARM64_PMEM is not set
|
||||||
# CONFIG_ARM64_PSEUDO_NMI is not set
|
# CONFIG_ARM64_PSEUDO_NMI is not set
|
||||||
|
@ -370,7 +366,7 @@ CONFIG_ARM_GIC_MAX_NR=1
|
||||||
# CONFIG_ARM_KPROBES_TEST is not set
|
# CONFIG_ARM_KPROBES_TEST is not set
|
||||||
# CONFIG_ARM_LPAE is not set
|
# CONFIG_ARM_LPAE is not set
|
||||||
# CONFIG_ARM_MHU is not set
|
# CONFIG_ARM_MHU is not set
|
||||||
CONFIG_ARM_MODULE_PLTS=y
|
# CONFIG_ARM_MODULE_PLTS is not set
|
||||||
# CONFIG_ARM_PATCH_PHYS_VIRT is not set
|
# CONFIG_ARM_PATCH_PHYS_VIRT is not set
|
||||||
# CONFIG_ARM_PSCI is not set
|
# CONFIG_ARM_PSCI is not set
|
||||||
# CONFIG_ARM_PSCI_CHECKER is not set
|
# CONFIG_ARM_PSCI_CHECKER is not set
|
||||||
|
@ -469,11 +465,6 @@ CONFIG_ATM_CLIP_NO_ICMP=y
|
||||||
# CONFIG_B43LEGACY is not set
|
# CONFIG_B43LEGACY is not set
|
||||||
# CONFIG_B44 is not set
|
# CONFIG_B44 is not set
|
||||||
# CONFIG_B53 is not set
|
# CONFIG_B53 is not set
|
||||||
# CONFIG_B53_MDIO_DRIVER is not set
|
|
||||||
# CONFIG_B53_MMAP_DRIVER is not set
|
|
||||||
# CONFIG_B53_SERDES is not set
|
|
||||||
# CONFIG_B53_SPI_DRIVER is not set
|
|
||||||
# CONFIG_B53_SRAB_DRIVER is not set
|
|
||||||
# CONFIG_BACKLIGHT_ADP8860 is not set
|
# CONFIG_BACKLIGHT_ADP8860 is not set
|
||||||
# CONFIG_BACKLIGHT_ADP8870 is not set
|
# CONFIG_BACKLIGHT_ADP8870 is not set
|
||||||
# CONFIG_BACKLIGHT_APPLE is not set
|
# CONFIG_BACKLIGHT_APPLE is not set
|
||||||
|
@ -661,9 +652,9 @@ CONFIG_BPF=y
|
||||||
# CONFIG_BPFILTER is not set
|
# CONFIG_BPFILTER is not set
|
||||||
CONFIG_BPF_JIT=y
|
CONFIG_BPF_JIT=y
|
||||||
# CONFIG_BPF_JIT_ALWAYS_ON is not set
|
# CONFIG_BPF_JIT_ALWAYS_ON is not set
|
||||||
|
# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set
|
||||||
# CONFIG_BPF_STREAM_PARSER is not set
|
# CONFIG_BPF_STREAM_PARSER is not set
|
||||||
CONFIG_BPF_SYSCALL=y
|
CONFIG_BPF_SYSCALL=y
|
||||||
# CONFIG_BPF_UNPRIV_DEFAULT_OFF is not set
|
|
||||||
# CONFIG_BPQETHER is not set
|
# CONFIG_BPQETHER is not set
|
||||||
CONFIG_BQL=y
|
CONFIG_BQL=y
|
||||||
CONFIG_BRANCH_PROFILE_NONE=y
|
CONFIG_BRANCH_PROFILE_NONE=y
|
||||||
|
@ -790,7 +781,6 @@ CONFIG_CARDBUS=y
|
||||||
# CONFIG_CAVIUM_ERRATUM_30115 is not set
|
# CONFIG_CAVIUM_ERRATUM_30115 is not set
|
||||||
# CONFIG_CAVIUM_OCTEON_SOC is not set
|
# CONFIG_CAVIUM_OCTEON_SOC is not set
|
||||||
# CONFIG_CAVIUM_PTP is not set
|
# CONFIG_CAVIUM_PTP is not set
|
||||||
# CONFIG_CAVIUM_TX2_ERRATUM_219 is not set
|
|
||||||
# CONFIG_CB710_CORE is not set
|
# CONFIG_CB710_CORE is not set
|
||||||
# CONFIG_CC10001_ADC is not set
|
# CONFIG_CC10001_ADC is not set
|
||||||
# CONFIG_CCS811 is not set
|
# CONFIG_CCS811 is not set
|
||||||
|
@ -853,6 +843,7 @@ CONFIG_CIFS_POSIX=y
|
||||||
# CONFIG_CIFS_WEAK_PW_HASH is not set
|
# CONFIG_CIFS_WEAK_PW_HASH is not set
|
||||||
CONFIG_CIFS_XATTR=y
|
CONFIG_CIFS_XATTR=y
|
||||||
# CONFIG_CIO_DAC is not set
|
# CONFIG_CIO_DAC is not set
|
||||||
|
CONFIG_CLANG_VERSION=0
|
||||||
# CONFIG_CLEANCACHE is not set
|
# CONFIG_CLEANCACHE is not set
|
||||||
# CONFIG_CLKSRC_VERSATILE is not set
|
# CONFIG_CLKSRC_VERSATILE is not set
|
||||||
# CONFIG_CLK_HSDK is not set
|
# CONFIG_CLK_HSDK is not set
|
||||||
|
@ -902,6 +893,7 @@ CONFIG_COMPACTION=y
|
||||||
# CONFIG_COMPAT_BRK is not set
|
# CONFIG_COMPAT_BRK is not set
|
||||||
# CONFIG_COMPILE_TEST is not set
|
# CONFIG_COMPILE_TEST is not set
|
||||||
# CONFIG_CONFIGFS_FS is not set
|
# CONFIG_CONFIGFS_FS is not set
|
||||||
|
# CONFIG_CONFIG_KVM_AMD_SEV is not set
|
||||||
# CONFIG_CONNECTOR is not set
|
# CONFIG_CONNECTOR is not set
|
||||||
CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
|
CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
|
||||||
CONFIG_CONSOLE_LOGLEVEL_QUIET=4
|
CONFIG_CONSOLE_LOGLEVEL_QUIET=4
|
||||||
|
@ -971,14 +963,14 @@ CONFIG_CRYPTO=y
|
||||||
CONFIG_CRYPTO_AES=y
|
CONFIG_CRYPTO_AES=y
|
||||||
# CONFIG_CRYPTO_AES_586 is not set
|
# CONFIG_CRYPTO_AES_586 is not set
|
||||||
# CONFIG_CRYPTO_AES_ARM is not set
|
# CONFIG_CRYPTO_AES_ARM is not set
|
||||||
|
# CONFIG_CRYPTO_AES_ARM_BS is not set
|
||||||
|
# CONFIG_CRYPTO_AES_ARM_CE is not set
|
||||||
# CONFIG_CRYPTO_AES_ARM64 is not set
|
# CONFIG_CRYPTO_AES_ARM64 is not set
|
||||||
# CONFIG_CRYPTO_AES_ARM64_BS is not set
|
# CONFIG_CRYPTO_AES_ARM64_BS is not set
|
||||||
# CONFIG_CRYPTO_AES_ARM64_CE is not set
|
# CONFIG_CRYPTO_AES_ARM64_CE is not set
|
||||||
# CONFIG_CRYPTO_AES_ARM64_CE_BLK is not set
|
# CONFIG_CRYPTO_AES_ARM64_CE_BLK is not set
|
||||||
# CONFIG_CRYPTO_AES_ARM64_CE_CCM is not set
|
# CONFIG_CRYPTO_AES_ARM64_CE_CCM is not set
|
||||||
# CONFIG_CRYPTO_AES_ARM64_NEON_BLK is not set
|
# CONFIG_CRYPTO_AES_ARM64_NEON_BLK is not set
|
||||||
# CONFIG_CRYPTO_AES_ARM_BS is not set
|
|
||||||
# CONFIG_CRYPTO_AES_ARM_CE is not set
|
|
||||||
# CONFIG_CRYPTO_AES_NI_INTEL is not set
|
# CONFIG_CRYPTO_AES_NI_INTEL is not set
|
||||||
# CONFIG_CRYPTO_AES_TI is not set
|
# CONFIG_CRYPTO_AES_TI is not set
|
||||||
CONFIG_CRYPTO_ALGAPI=y
|
CONFIG_CRYPTO_ALGAPI=y
|
||||||
|
@ -1008,8 +1000,8 @@ CONFIG_CRYPTO_BLKCIPHER2=y
|
||||||
# CONFIG_CRYPTO_CRC32C_INTEL is not set
|
# CONFIG_CRYPTO_CRC32C_INTEL is not set
|
||||||
# CONFIG_CRYPTO_CRC32_ARM_CE is not set
|
# CONFIG_CRYPTO_CRC32_ARM_CE is not set
|
||||||
# CONFIG_CRYPTO_CRCT10DIF is not set
|
# CONFIG_CRYPTO_CRCT10DIF is not set
|
||||||
# CONFIG_CRYPTO_CRCT10DIF_ARM64_CE is not set
|
|
||||||
# CONFIG_CRYPTO_CRCT10DIF_ARM_CE is not set
|
# CONFIG_CRYPTO_CRCT10DIF_ARM_CE is not set
|
||||||
|
# CONFIG_CRYPTO_CRCT10DIF_ARM64_CE is not set
|
||||||
# CONFIG_CRYPTO_CRYPTD is not set
|
# CONFIG_CRYPTO_CRYPTD is not set
|
||||||
# CONFIG_CRYPTO_CTR is not set
|
# CONFIG_CRYPTO_CTR is not set
|
||||||
# CONFIG_CRYPTO_CTS is not set
|
# CONFIG_CRYPTO_CTS is not set
|
||||||
|
@ -1066,8 +1058,8 @@ CONFIG_CRYPTO_BLKCIPHER2=y
|
||||||
# CONFIG_CRYPTO_GCM is not set
|
# CONFIG_CRYPTO_GCM is not set
|
||||||
# CONFIG_CRYPTO_GF128MUL is not set
|
# CONFIG_CRYPTO_GF128MUL is not set
|
||||||
# CONFIG_CRYPTO_GHASH is not set
|
# CONFIG_CRYPTO_GHASH is not set
|
||||||
# CONFIG_CRYPTO_GHASH_ARM64_CE is not set
|
|
||||||
# CONFIG_CRYPTO_GHASH_ARM_CE is not set
|
# CONFIG_CRYPTO_GHASH_ARM_CE is not set
|
||||||
|
# CONFIG_CRYPTO_GHASH_ARM64_CE is not set
|
||||||
# CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL is not set
|
# CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL is not set
|
||||||
# CONFIG_CRYPTO_HASH is not set
|
# CONFIG_CRYPTO_HASH is not set
|
||||||
# CONFIG_CRYPTO_HMAC is not set
|
# CONFIG_CRYPTO_HMAC is not set
|
||||||
|
@ -1123,14 +1115,14 @@ CONFIG_CRYPTO_PCRYPT=y
|
||||||
# CONFIG_CRYPTO_SERPENT is not set
|
# CONFIG_CRYPTO_SERPENT is not set
|
||||||
# CONFIG_CRYPTO_SHA1 is not set
|
# CONFIG_CRYPTO_SHA1 is not set
|
||||||
# CONFIG_CRYPTO_SHA1_ARM is not set
|
# CONFIG_CRYPTO_SHA1_ARM is not set
|
||||||
# CONFIG_CRYPTO_SHA1_ARM64_CE is not set
|
|
||||||
# CONFIG_CRYPTO_SHA1_ARM_CE is not set
|
# CONFIG_CRYPTO_SHA1_ARM_CE is not set
|
||||||
# CONFIG_CRYPTO_SHA1_ARM_NEON is not set
|
# CONFIG_CRYPTO_SHA1_ARM_NEON is not set
|
||||||
|
# CONFIG_CRYPTO_SHA1_ARM64_CE is not set
|
||||||
# CONFIG_CRYPTO_SHA256 is not set
|
# CONFIG_CRYPTO_SHA256 is not set
|
||||||
# CONFIG_CRYPTO_SHA256_ARM is not set
|
# CONFIG_CRYPTO_SHA256_ARM is not set
|
||||||
# CONFIG_CRYPTO_SHA256_ARM64 is not set
|
# CONFIG_CRYPTO_SHA256_ARM64 is not set
|
||||||
# CONFIG_CRYPTO_SHA2_ARM64_CE is not set
|
|
||||||
# CONFIG_CRYPTO_SHA2_ARM_CE is not set
|
# CONFIG_CRYPTO_SHA2_ARM_CE is not set
|
||||||
|
# CONFIG_CRYPTO_SHA2_ARM64_CE is not set
|
||||||
# CONFIG_CRYPTO_SHA3 is not set
|
# CONFIG_CRYPTO_SHA3 is not set
|
||||||
# CONFIG_CRYPTO_SHA3_ARM64 is not set
|
# CONFIG_CRYPTO_SHA3_ARM64 is not set
|
||||||
# CONFIG_CRYPTO_SHA512 is not set
|
# CONFIG_CRYPTO_SHA512 is not set
|
||||||
|
@ -1449,7 +1441,6 @@ CONFIG_DQL=y
|
||||||
# CONFIG_DRM_TI_TFP410 is not set
|
# CONFIG_DRM_TI_TFP410 is not set
|
||||||
# CONFIG_DRM_TOSHIBA_TC358764 is not set
|
# CONFIG_DRM_TOSHIBA_TC358764 is not set
|
||||||
# CONFIG_DRM_TOSHIBA_TC358767 is not set
|
# CONFIG_DRM_TOSHIBA_TC358767 is not set
|
||||||
# CONFIG_DRM_TVE200 is not set
|
|
||||||
# CONFIG_DRM_UDL is not set
|
# CONFIG_DRM_UDL is not set
|
||||||
# CONFIG_DRM_VBOXVIDEO is not set
|
# CONFIG_DRM_VBOXVIDEO is not set
|
||||||
# CONFIG_DRM_VC4_HDMI_CEC is not set
|
# CONFIG_DRM_VC4_HDMI_CEC is not set
|
||||||
|
@ -1535,13 +1526,7 @@ CONFIG_ETHERNET=y
|
||||||
# CONFIG_ETHOC is not set
|
# CONFIG_ETHOC is not set
|
||||||
CONFIG_EVENTFD=y
|
CONFIG_EVENTFD=y
|
||||||
# CONFIG_EVM is not set
|
# CONFIG_EVM is not set
|
||||||
# CONFIG_EXFAT_DEBUG_MSG is not set
|
|
||||||
CONFIG_EXFAT_DEFAULT_CODEPAGE=437
|
|
||||||
# CONFIG_EXFAT_DELAYED_SYNC is not set
|
|
||||||
CONFIG_EXFAT_DISCARD=y
|
|
||||||
CONFIG_EXFAT_DONT_MOUNT_VFAT=y
|
|
||||||
# CONFIG_EXFAT_FS is not set
|
# CONFIG_EXFAT_FS is not set
|
||||||
# CONFIG_EXFAT_KERNEL_DEBUG is not set
|
|
||||||
CONFIG_EXPERT=y
|
CONFIG_EXPERT=y
|
||||||
CONFIG_EXPORTFS=y
|
CONFIG_EXPORTFS=y
|
||||||
# CONFIG_EXPORTFS_BLOCK_OPS is not set
|
# CONFIG_EXPORTFS_BLOCK_OPS is not set
|
||||||
|
@ -1720,7 +1705,6 @@ CONFIG_FILE_LOCKING=y
|
||||||
# CONFIG_FIRMWARE_EDID is not set
|
# CONFIG_FIRMWARE_EDID is not set
|
||||||
# CONFIG_FIRMWARE_IN_KERNEL is not set
|
# CONFIG_FIRMWARE_IN_KERNEL is not set
|
||||||
# CONFIG_FIRMWARE_MEMMAP is not set
|
# CONFIG_FIRMWARE_MEMMAP is not set
|
||||||
# CONFIG_FIT_PARTITION is not set
|
|
||||||
# CONFIG_FIXED_PHY is not set
|
# CONFIG_FIXED_PHY is not set
|
||||||
CONFIG_FLATMEM=y
|
CONFIG_FLATMEM=y
|
||||||
CONFIG_FLATMEM_MANUAL=y
|
CONFIG_FLATMEM_MANUAL=y
|
||||||
|
@ -1759,7 +1743,6 @@ CONFIG_FSNOTIFY=y
|
||||||
# CONFIG_FTRACE_STARTUP_TEST is not set
|
# CONFIG_FTRACE_STARTUP_TEST is not set
|
||||||
# CONFIG_FTR_FIXUP_SELFTEST is not set
|
# CONFIG_FTR_FIXUP_SELFTEST is not set
|
||||||
# CONFIG_FTWDT010_WATCHDOG is not set
|
# CONFIG_FTWDT010_WATCHDOG is not set
|
||||||
# CONFIG_FUJITSU_ERRATUM_010001 is not set
|
|
||||||
# CONFIG_FUJITSU_ES is not set
|
# CONFIG_FUJITSU_ES is not set
|
||||||
# CONFIG_FUJITSU_LAPTOP is not set
|
# CONFIG_FUJITSU_LAPTOP is not set
|
||||||
# CONFIG_FUJITSU_TABLET is not set
|
# CONFIG_FUJITSU_TABLET is not set
|
||||||
|
@ -2093,8 +2076,8 @@ CONFIG_HW_RANDOM_TPM=y
|
||||||
# CONFIG_HYPERV is not set
|
# CONFIG_HYPERV is not set
|
||||||
# CONFIG_HYPERV_TSCPAGE is not set
|
# CONFIG_HYPERV_TSCPAGE is not set
|
||||||
# CONFIG_HYSDN is not set
|
# CONFIG_HYSDN is not set
|
||||||
CONFIG_HZ=100
|
# CONFIG_HZ is not set
|
||||||
CONFIG_HZ_100=y
|
# CONFIG_HZ_100 is not set
|
||||||
# CONFIG_HZ_1000 is not set
|
# CONFIG_HZ_1000 is not set
|
||||||
# CONFIG_HZ_1024 is not set
|
# CONFIG_HZ_1024 is not set
|
||||||
# CONFIG_HZ_128 is not set
|
# CONFIG_HZ_128 is not set
|
||||||
|
@ -2129,7 +2112,6 @@ CONFIG_HZ_100=y
|
||||||
# CONFIG_I2C_DEMUX_PINCTRL is not set
|
# CONFIG_I2C_DEMUX_PINCTRL is not set
|
||||||
# CONFIG_I2C_DESIGNWARE_PCI is not set
|
# CONFIG_I2C_DESIGNWARE_PCI is not set
|
||||||
# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
|
# CONFIG_I2C_DESIGNWARE_PLATFORM is not set
|
||||||
# CONFIG_I2C_DESIGNWARE_SLAVE is not set
|
|
||||||
# CONFIG_I2C_DIOLAN_U2C is not set
|
# CONFIG_I2C_DIOLAN_U2C is not set
|
||||||
# CONFIG_I2C_EG20T is not set
|
# CONFIG_I2C_EG20T is not set
|
||||||
# CONFIG_I2C_ELEKTOR is not set
|
# CONFIG_I2C_ELEKTOR is not set
|
||||||
|
@ -2167,7 +2149,6 @@ CONFIG_HZ_100=y
|
||||||
# CONFIG_I2C_PCA_PLATFORM is not set
|
# CONFIG_I2C_PCA_PLATFORM is not set
|
||||||
# CONFIG_I2C_PIIX4 is not set
|
# CONFIG_I2C_PIIX4 is not set
|
||||||
# CONFIG_I2C_PXA_PCI is not set
|
# CONFIG_I2C_PXA_PCI is not set
|
||||||
# CONFIG_I2C_PXA_SLAVE is not set
|
|
||||||
# CONFIG_I2C_RCAR is not set
|
# CONFIG_I2C_RCAR is not set
|
||||||
# CONFIG_I2C_RK3X is not set
|
# CONFIG_I2C_RK3X is not set
|
||||||
# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
|
# CONFIG_I2C_ROBOTFUZZ_OSIF is not set
|
||||||
|
@ -2465,7 +2446,6 @@ CONFIG_IPV6_NDISC_NODETYPE=y
|
||||||
# CONFIG_IPV6_TUNNEL is not set
|
# CONFIG_IPV6_TUNNEL is not set
|
||||||
# CONFIG_IPV6_VTI is not set
|
# CONFIG_IPV6_VTI is not set
|
||||||
# CONFIG_IPVLAN is not set
|
# CONFIG_IPVLAN is not set
|
||||||
# CONFIG_IPVTAP is not set
|
|
||||||
# CONFIG_IPW2100 is not set
|
# CONFIG_IPW2100 is not set
|
||||||
# CONFIG_IPW2100_DEBUG is not set
|
# CONFIG_IPW2100_DEBUG is not set
|
||||||
CONFIG_IPW2100_MONITOR=y
|
CONFIG_IPW2100_MONITOR=y
|
||||||
|
@ -2657,7 +2637,6 @@ CONFIG_KERNFS=y
|
||||||
# CONFIG_KGDB is not set
|
# CONFIG_KGDB is not set
|
||||||
# CONFIG_KMEMCHECK is not set
|
# CONFIG_KMEMCHECK is not set
|
||||||
# CONFIG_KMX61 is not set
|
# CONFIG_KMX61 is not set
|
||||||
# CONFIG_KPC2000 is not set
|
|
||||||
# CONFIG_KPROBES is not set
|
# CONFIG_KPROBES is not set
|
||||||
# CONFIG_KPROBES_SANITY_TEST is not set
|
# CONFIG_KPROBES_SANITY_TEST is not set
|
||||||
# CONFIG_KS7010 is not set
|
# CONFIG_KS7010 is not set
|
||||||
|
@ -2668,7 +2647,6 @@ CONFIG_KERNFS=y
|
||||||
# CONFIG_KSZ884X_PCI is not set
|
# CONFIG_KSZ884X_PCI is not set
|
||||||
CONFIG_KUSER_HELPERS=y
|
CONFIG_KUSER_HELPERS=y
|
||||||
# CONFIG_KVM_AMD is not set
|
# CONFIG_KVM_AMD is not set
|
||||||
# CONFIG_KVM_AMD_SEV is not set
|
|
||||||
# CONFIG_KVM_GUEST is not set
|
# CONFIG_KVM_GUEST is not set
|
||||||
# CONFIG_KVM_INTEL is not set
|
# CONFIG_KVM_INTEL is not set
|
||||||
# CONFIG_KXCJK1013 is not set
|
# CONFIG_KXCJK1013 is not set
|
||||||
|
@ -2836,7 +2814,6 @@ CONFIG_LZMA_DECOMPRESS=y
|
||||||
# CONFIG_MAC80211_MESSAGE_TRACING is not set
|
# CONFIG_MAC80211_MESSAGE_TRACING is not set
|
||||||
CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
|
CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
|
||||||
# CONFIG_MACB is not set
|
# CONFIG_MACB is not set
|
||||||
# CONFIG_MACB_USE_HWSTAMP is not set
|
|
||||||
# CONFIG_MACH_ASM9260 is not set
|
# CONFIG_MACH_ASM9260 is not set
|
||||||
# CONFIG_MACH_DECSTATION is not set
|
# CONFIG_MACH_DECSTATION is not set
|
||||||
# CONFIG_MACH_INGENIC is not set
|
# CONFIG_MACH_INGENIC is not set
|
||||||
|
@ -3171,6 +3148,8 @@ CONFIG_MODULE_UNLOAD=y
|
||||||
# CONFIG_MPL115_SPI is not set
|
# CONFIG_MPL115_SPI is not set
|
||||||
# CONFIG_MPL3115 is not set
|
# CONFIG_MPL3115 is not set
|
||||||
# CONFIG_MPLS is not set
|
# CONFIG_MPLS is not set
|
||||||
|
# CONFIG_MPLS_IPTUNNEL is not set
|
||||||
|
# CONFIG_MPLS_ROUTING is not set
|
||||||
# CONFIG_MPU3050_I2C is not set
|
# CONFIG_MPU3050_I2C is not set
|
||||||
# CONFIG_MQ_IOSCHED_DEADLINE is not set
|
# CONFIG_MQ_IOSCHED_DEADLINE is not set
|
||||||
# CONFIG_MQ_IOSCHED_KYBER is not set
|
# CONFIG_MQ_IOSCHED_KYBER is not set
|
||||||
|
@ -3315,7 +3294,6 @@ CONFIG_MTD_ROOTFS_ROOT_DEV=y
|
||||||
# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
|
# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
|
||||||
CONFIG_MTD_SPI_NOR_USE_4K_SECTORS_LIMIT=4096
|
CONFIG_MTD_SPI_NOR_USE_4K_SECTORS_LIMIT=4096
|
||||||
CONFIG_MTD_SPLIT=y
|
CONFIG_MTD_SPLIT=y
|
||||||
# CONFIG_MTD_SPLIT_BCM63XX_FW is not set
|
|
||||||
# CONFIG_MTD_SPLIT_BCM_WFI_FW is not set
|
# CONFIG_MTD_SPLIT_BCM_WFI_FW is not set
|
||||||
# CONFIG_MTD_SPLIT_BRNIMAGE_FW is not set
|
# CONFIG_MTD_SPLIT_BRNIMAGE_FW is not set
|
||||||
# CONFIG_MTD_SPLIT_ELF_FW is not set
|
# CONFIG_MTD_SPLIT_ELF_FW is not set
|
||||||
|
@ -3347,6 +3325,7 @@ CONFIG_MULTIUSER=y
|
||||||
# CONFIG_MV643XX_ETH is not set
|
# CONFIG_MV643XX_ETH is not set
|
||||||
# CONFIG_MVMDIO is not set
|
# CONFIG_MVMDIO is not set
|
||||||
# CONFIG_MVNETA_BM is not set
|
# CONFIG_MVNETA_BM is not set
|
||||||
|
# CONFIG_MVSWITCH_PHY is not set
|
||||||
# CONFIG_MV_XOR_V2 is not set
|
# CONFIG_MV_XOR_V2 is not set
|
||||||
# CONFIG_MWAVE is not set
|
# CONFIG_MWAVE is not set
|
||||||
# CONFIG_MWL8K is not set
|
# CONFIG_MWL8K is not set
|
||||||
|
@ -3509,7 +3488,6 @@ CONFIG_NET_CORE=y
|
||||||
# CONFIG_NET_DSA_MV88E6352 is not set
|
# CONFIG_NET_DSA_MV88E6352 is not set
|
||||||
# CONFIG_NET_DSA_MV88E6XXX is not set
|
# CONFIG_NET_DSA_MV88E6XXX is not set
|
||||||
# CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set
|
# CONFIG_NET_DSA_MV88E6XXX_NEED_PPU is not set
|
||||||
# CONFIG_NET_DSA_MV88E6XXX_PTP is not set
|
|
||||||
# CONFIG_NET_DSA_QCA8K is not set
|
# CONFIG_NET_DSA_QCA8K is not set
|
||||||
# CONFIG_NET_DSA_REALTEK_SMI is not set
|
# CONFIG_NET_DSA_REALTEK_SMI is not set
|
||||||
# CONFIG_NET_DSA_SJA1105 is not set
|
# CONFIG_NET_DSA_SJA1105 is not set
|
||||||
|
@ -3717,10 +3695,11 @@ CONFIG_NFS_V3=y
|
||||||
# CONFIG_NF_CONNTRACK is not set
|
# CONFIG_NF_CONNTRACK is not set
|
||||||
# CONFIG_NF_CONNTRACK_AMANDA is not set
|
# CONFIG_NF_CONNTRACK_AMANDA is not set
|
||||||
# CONFIG_NF_CONNTRACK_BRIDGE is not set
|
# CONFIG_NF_CONNTRACK_BRIDGE is not set
|
||||||
# CONFIG_NF_CONNTRACK_CHAIN_EVENTS is not set
|
|
||||||
# CONFIG_NF_CONNTRACK_EVENTS is not set
|
# CONFIG_NF_CONNTRACK_EVENTS is not set
|
||||||
# CONFIG_NF_CONNTRACK_FTP is not set
|
# CONFIG_NF_CONNTRACK_FTP is not set
|
||||||
# CONFIG_NF_CONNTRACK_H323 is not set
|
# CONFIG_NF_CONNTRACK_H323 is not set
|
||||||
|
# CONFIG_NF_CONNTRACK_IPV4 is not set
|
||||||
|
# CONFIG_NF_CONNTRACK_IPV6 is not set
|
||||||
# CONFIG_NF_CONNTRACK_IRC is not set
|
# CONFIG_NF_CONNTRACK_IRC is not set
|
||||||
# CONFIG_NF_CONNTRACK_LABELS is not set
|
# CONFIG_NF_CONNTRACK_LABELS is not set
|
||||||
# CONFIG_NF_CONNTRACK_MARK is not set
|
# CONFIG_NF_CONNTRACK_MARK is not set
|
||||||
|
@ -3737,8 +3716,8 @@ CONFIG_NF_CONNTRACK_PROCFS=y
|
||||||
# CONFIG_NF_CONNTRACK_TIMESTAMP is not set
|
# CONFIG_NF_CONNTRACK_TIMESTAMP is not set
|
||||||
# CONFIG_NF_CONNTRACK_ZONES is not set
|
# CONFIG_NF_CONNTRACK_ZONES is not set
|
||||||
# CONFIG_NF_CT_NETLINK is not set
|
# CONFIG_NF_CT_NETLINK is not set
|
||||||
# CONFIG_NF_CT_NETLINK_HELPER is not set
|
|
||||||
# CONFIG_NF_CT_NETLINK_TIMEOUT is not set
|
# CONFIG_NF_CT_NETLINK_TIMEOUT is not set
|
||||||
|
# CONFIG_NF_CT_NETLINK_HELPER is not set
|
||||||
# CONFIG_NF_CT_PROTO_DCCP is not set
|
# CONFIG_NF_CT_PROTO_DCCP is not set
|
||||||
# CONFIG_NF_CT_PROTO_GRE is not set
|
# CONFIG_NF_CT_PROTO_GRE is not set
|
||||||
# CONFIG_NF_CT_PROTO_SCTP is not set
|
# CONFIG_NF_CT_PROTO_SCTP is not set
|
||||||
|
@ -3756,8 +3735,7 @@ CONFIG_NF_CONNTRACK_PROCFS=y
|
||||||
# CONFIG_NF_NAT_FTP is not set
|
# CONFIG_NF_NAT_FTP is not set
|
||||||
# CONFIG_NF_NAT_H323 is not set
|
# CONFIG_NF_NAT_H323 is not set
|
||||||
# CONFIG_NF_NAT_IRC is not set
|
# CONFIG_NF_NAT_IRC is not set
|
||||||
CONFIG_NF_NAT_MASQUERADE_IPV4=y
|
# CONFIG_NF_NAT_MASQUERADE is not set
|
||||||
CONFIG_NF_NAT_MASQUERADE_IPV6=y
|
|
||||||
# CONFIG_NF_NAT_NEEDED is not set
|
# CONFIG_NF_NAT_NEEDED is not set
|
||||||
# CONFIG_NF_NAT_PPTP is not set
|
# CONFIG_NF_NAT_PPTP is not set
|
||||||
# CONFIG_NF_NAT_PROTO_GRE is not set
|
# CONFIG_NF_NAT_PROTO_GRE is not set
|
||||||
|
@ -4117,6 +4095,7 @@ CONFIG_PINMUX=y
|
||||||
# CONFIG_PLATFORM_MHU is not set
|
# CONFIG_PLATFORM_MHU is not set
|
||||||
# CONFIG_PLAT_SPEAR is not set
|
# CONFIG_PLAT_SPEAR is not set
|
||||||
# CONFIG_PLIP is not set
|
# CONFIG_PLIP is not set
|
||||||
|
CONFIG_PLUGIN_HOSTCC=""
|
||||||
# CONFIG_PLX_HERMES is not set
|
# CONFIG_PLX_HERMES is not set
|
||||||
# CONFIG_PM is not set
|
# CONFIG_PM is not set
|
||||||
# CONFIG_PMBUS is not set
|
# CONFIG_PMBUS is not set
|
||||||
|
@ -4137,7 +4116,6 @@ CONFIG_POSIX_TIMERS=y
|
||||||
# CONFIG_POWER_RESET_BRCMSTB is not set
|
# CONFIG_POWER_RESET_BRCMSTB is not set
|
||||||
# CONFIG_POWER_RESET_GPIO is not set
|
# CONFIG_POWER_RESET_GPIO is not set
|
||||||
# CONFIG_POWER_RESET_GPIO_RESTART is not set
|
# CONFIG_POWER_RESET_GPIO_RESTART is not set
|
||||||
# CONFIG_POWER_RESET_LINKSTATION is not set
|
|
||||||
# CONFIG_POWER_RESET_LTC2952 is not set
|
# CONFIG_POWER_RESET_LTC2952 is not set
|
||||||
# CONFIG_POWER_RESET_PIIX4_POWEROFF is not set
|
# CONFIG_POWER_RESET_PIIX4_POWEROFF is not set
|
||||||
# CONFIG_POWER_RESET_RESTART is not set
|
# CONFIG_POWER_RESET_RESTART is not set
|
||||||
|
@ -4277,14 +4255,16 @@ CONFIG_PWRSEQ_SIMPLE=y
|
||||||
# CONFIG_RAW_DRIVER is not set
|
# CONFIG_RAW_DRIVER is not set
|
||||||
# CONFIG_RBTREE_TEST is not set
|
# CONFIG_RBTREE_TEST is not set
|
||||||
# CONFIG_RCU_BOOST is not set
|
# CONFIG_RCU_BOOST is not set
|
||||||
CONFIG_RCU_CPU_STALL_TIMEOUT=21
|
CONFIG_RCU_CPU_STALL_TIMEOUT=60
|
||||||
# CONFIG_RCU_EQS_DEBUG is not set
|
# CONFIG_RCU_EQS_DEBUG is not set
|
||||||
# CONFIG_RCU_EXPEDITE_BOOT is not set
|
# CONFIG_RCU_EXPEDITE_BOOT is not set
|
||||||
# CONFIG_RCU_EXPERT is not set
|
CONFIG_RCU_EXPERT=y
|
||||||
|
CONFIG_RCU_FANOUT=32
|
||||||
|
CONFIG_RCU_FANOUT_LEAF=16
|
||||||
|
# CONFIG_RCU_FAST_NO_HZ is not set
|
||||||
CONFIG_RCU_KTHREAD_PRIO=0
|
CONFIG_RCU_KTHREAD_PRIO=0
|
||||||
CONFIG_RCU_NEED_SEGCBLIST=y
|
# CONFIG_RCU_NOCB_CPU is not set
|
||||||
# CONFIG_RCU_PERF_TEST is not set
|
# CONFIG_RCU_PERF_TEST is not set
|
||||||
CONFIG_RCU_STALL_COMMON=y
|
|
||||||
# CONFIG_RCU_TORTURE_TEST is not set
|
# CONFIG_RCU_TORTURE_TEST is not set
|
||||||
CONFIG_RCU_TORTURE_TEST_SLOW_INIT_DELAY=3
|
CONFIG_RCU_TORTURE_TEST_SLOW_INIT_DELAY=3
|
||||||
# CONFIG_RCU_TRACE is not set
|
# CONFIG_RCU_TRACE is not set
|
||||||
|
@ -4330,7 +4310,6 @@ CONFIG_RCU_TORTURE_TEST_SLOW_INIT_DELAY=3
|
||||||
# CONFIG_REGULATOR_LTC3589 is not set
|
# CONFIG_REGULATOR_LTC3589 is not set
|
||||||
# CONFIG_REGULATOR_LTC3676 is not set
|
# CONFIG_REGULATOR_LTC3676 is not set
|
||||||
# CONFIG_REGULATOR_MAX1586 is not set
|
# CONFIG_REGULATOR_MAX1586 is not set
|
||||||
# CONFIG_REGULATOR_MAX77620 is not set
|
|
||||||
# CONFIG_REGULATOR_MAX8649 is not set
|
# CONFIG_REGULATOR_MAX8649 is not set
|
||||||
# CONFIG_REGULATOR_MAX8660 is not set
|
# CONFIG_REGULATOR_MAX8660 is not set
|
||||||
# CONFIG_REGULATOR_MAX8952 is not set
|
# CONFIG_REGULATOR_MAX8952 is not set
|
||||||
|
@ -4660,7 +4639,6 @@ CONFIG_SECTION_MISMATCH_WARN_ONLY=y
|
||||||
CONFIG_SECURITY_DMESG_RESTRICT=y
|
CONFIG_SECURITY_DMESG_RESTRICT=y
|
||||||
# CONFIG_SECURITY_LOADPIN is not set
|
# CONFIG_SECURITY_LOADPIN is not set
|
||||||
# CONFIG_SECURITY_LOCKDOWN_LSM is not set
|
# CONFIG_SECURITY_LOCKDOWN_LSM is not set
|
||||||
# CONFIG_SECURITY_NETWORK_XFRM is not set
|
|
||||||
# CONFIG_SECURITY_PATH is not set
|
# CONFIG_SECURITY_PATH is not set
|
||||||
# CONFIG_SECURITY_SAFESETID is not set
|
# CONFIG_SECURITY_SAFESETID is not set
|
||||||
# CONFIG_SECURITY_SELINUX_AVC_STATS is not set
|
# CONFIG_SECURITY_SELINUX_AVC_STATS is not set
|
||||||
|
@ -5640,7 +5618,6 @@ CONFIG_TCP_CONG_CUBIC=y
|
||||||
# CONFIG_TEST_STRING_HELPERS is not set
|
# CONFIG_TEST_STRING_HELPERS is not set
|
||||||
# CONFIG_TEST_STRSCPY is not set
|
# CONFIG_TEST_STRSCPY is not set
|
||||||
# CONFIG_TEST_SYSCTL is not set
|
# CONFIG_TEST_SYSCTL is not set
|
||||||
# CONFIG_TEST_UBSAN is not set
|
|
||||||
# CONFIG_TEST_UDELAY is not set
|
# CONFIG_TEST_UDELAY is not set
|
||||||
# CONFIG_TEST_USER_COPY is not set
|
# CONFIG_TEST_USER_COPY is not set
|
||||||
# CONFIG_TEST_UUID is not set
|
# CONFIG_TEST_UUID is not set
|
||||||
|
@ -5890,14 +5867,12 @@ CONFIG_TTY=y
|
||||||
# CONFIG_TYPHOON is not set
|
# CONFIG_TYPHOON is not set
|
||||||
# CONFIG_UACCESS_WITH_MEMCPY is not set
|
# CONFIG_UACCESS_WITH_MEMCPY is not set
|
||||||
# CONFIG_UBIFS_ATIME_SUPPORT is not set
|
# CONFIG_UBIFS_ATIME_SUPPORT is not set
|
||||||
# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
|
|
||||||
# CONFIG_UBIFS_FS_AUTHENTICATION is not set
|
# CONFIG_UBIFS_FS_AUTHENTICATION is not set
|
||||||
# CONFIG_UBIFS_FS_ENCRYPTION is not set
|
# CONFIG_UBIFS_FS_ENCRYPTION is not set
|
||||||
CONFIG_UBIFS_FS_LZO=y
|
|
||||||
# CONFIG_UBIFS_FS_SECURITY is not set
|
# CONFIG_UBIFS_FS_SECURITY is not set
|
||||||
|
# CONFIG_UBIFS_FS_ZLIB is not set
|
||||||
|
# CONFIG_UBIFS_FS_ZSTD is not set
|
||||||
CONFIG_UBIFS_FS_XATTR=y
|
CONFIG_UBIFS_FS_XATTR=y
|
||||||
CONFIG_UBIFS_FS_ZLIB=y
|
|
||||||
CONFIG_UBIFS_FS_ZSTD=y
|
|
||||||
# CONFIG_UBSAN is not set
|
# CONFIG_UBSAN is not set
|
||||||
CONFIG_UBSAN_ALIGNMENT=y
|
CONFIG_UBSAN_ALIGNMENT=y
|
||||||
# CONFIG_UCB1400_CORE is not set
|
# CONFIG_UCB1400_CORE is not set
|
||||||
|
@ -6159,7 +6134,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
|
||||||
# CONFIG_USB_RCAR_PHY is not set
|
# CONFIG_USB_RCAR_PHY is not set
|
||||||
# CONFIG_USB_RENESAS_USBHS is not set
|
# CONFIG_USB_RENESAS_USBHS is not set
|
||||||
# CONFIG_USB_RIO500 is not set
|
# CONFIG_USB_RIO500 is not set
|
||||||
# CONFIG_USB_ROLES_INTEL_XHCI is not set
|
|
||||||
# CONFIG_USB_ROLE_SWITCH is not set
|
# CONFIG_USB_ROLE_SWITCH is not set
|
||||||
# CONFIG_USB_RTL8150 is not set
|
# CONFIG_USB_RTL8150 is not set
|
||||||
# CONFIG_USB_RTL8152 is not set
|
# CONFIG_USB_RTL8152 is not set
|
||||||
|
@ -6282,7 +6256,6 @@ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
|
||||||
# CONFIG_USB_ZR364XX is not set
|
# CONFIG_USB_ZR364XX is not set
|
||||||
# CONFIG_USELIB is not set
|
# CONFIG_USELIB is not set
|
||||||
# CONFIG_USERFAULTFD is not set
|
# CONFIG_USERFAULTFD is not set
|
||||||
# CONFIG_USERIO is not set
|
|
||||||
# CONFIG_USE_OF is not set
|
# CONFIG_USE_OF is not set
|
||||||
# CONFIG_UTS_NS is not set
|
# CONFIG_UTS_NS is not set
|
||||||
# CONFIG_UWB is not set
|
# CONFIG_UWB is not set
|
||||||
|
@ -6318,8 +6291,6 @@ CONFIG_VDSO=y
|
||||||
# CONFIG_VIDEO_ADV_DEBUG is not set
|
# CONFIG_VIDEO_ADV_DEBUG is not set
|
||||||
# CONFIG_VIDEO_AK881X is not set
|
# CONFIG_VIDEO_AK881X is not set
|
||||||
# CONFIG_VIDEO_ASPEED is not set
|
# CONFIG_VIDEO_ASPEED is not set
|
||||||
# CONFIG_VIDEO_ATMEL_ISC is not set
|
|
||||||
# CONFIG_VIDEO_ATMEL_ISI is not set
|
|
||||||
# CONFIG_VIDEO_BT819 is not set
|
# CONFIG_VIDEO_BT819 is not set
|
||||||
# CONFIG_VIDEO_BT848 is not set
|
# CONFIG_VIDEO_BT848 is not set
|
||||||
# CONFIG_VIDEO_BT856 is not set
|
# CONFIG_VIDEO_BT856 is not set
|
||||||
|
|
|
@ -183,6 +183,16 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
||||||
flow_offload_free(flow);
|
flow_offload_free(flow);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -361,6 +370,9 @@ static void nf_flow_offload_gc_step(stru
|
||||||
|
if (!teardown)
|
||||||
|
nf_ct_offload_timeout(flow);
|
||||||
|
|
||||||
|
+ if (nf_flow_in_hw(flow) && !teardown)
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
if (nf_flow_has_expired(flow) || teardown)
|
||||||
|
flow_offload_del(flow_table, flow);
|
||||||
|
}
|
||||||
@@ -490,10 +502,43 @@ int nf_flow_dnat_port(const struct flow_
|
@@ -490,10 +502,43 @@ int nf_flow_dnat_port(const struct flow_
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(nf_flow_dnat_port);
|
EXPORT_SYMBOL_GPL(nf_flow_dnat_port);
|
||||||
|
@ -496,7 +506,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
||||||
+MODULE_ALIAS("nf-flow-table-hw");
|
+MODULE_ALIAS("nf-flow-table-hw");
|
||||||
--- a/net/netfilter/nf_tables_api.c
|
--- a/net/netfilter/nf_tables_api.c
|
||||||
+++ b/net/netfilter/nf_tables_api.c
|
+++ b/net/netfilter/nf_tables_api.c
|
||||||
@@ -5743,6 +5743,13 @@ static int nf_tables_flowtable_parse_hoo
|
@@ -5748,6 +5748,13 @@ static int nf_tables_flowtable_parse_hoo
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
return err;
|
return err;
|
||||||
|
|
||||||
|
@ -510,7 +520,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
||||||
ops = kcalloc(n, sizeof(struct nf_hook_ops), GFP_KERNEL);
|
ops = kcalloc(n, sizeof(struct nf_hook_ops), GFP_KERNEL);
|
||||||
if (!ops)
|
if (!ops)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
@@ -5873,10 +5880,19 @@ static int nf_tables_newflowtable(struct
|
@@ -5878,10 +5885,19 @@ static int nf_tables_newflowtable(struct
|
||||||
}
|
}
|
||||||
|
|
||||||
flowtable->data.type = type;
|
flowtable->data.type = type;
|
||||||
|
@ -530,7 +540,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
||||||
err = nf_tables_flowtable_parse_hook(&ctx, nla[NFTA_FLOWTABLE_HOOK],
|
err = nf_tables_flowtable_parse_hook(&ctx, nla[NFTA_FLOWTABLE_HOOK],
|
||||||
flowtable);
|
flowtable);
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
@@ -6002,7 +6018,8 @@ static int nf_tables_fill_flowtable_info
|
@@ -6007,7 +6023,8 @@ static int nf_tables_fill_flowtable_info
|
||||||
nla_put_string(skb, NFTA_FLOWTABLE_NAME, flowtable->name) ||
|
nla_put_string(skb, NFTA_FLOWTABLE_NAME, flowtable->name) ||
|
||||||
nla_put_be32(skb, NFTA_FLOWTABLE_USE, htonl(flowtable->use)) ||
|
nla_put_be32(skb, NFTA_FLOWTABLE_USE, htonl(flowtable->use)) ||
|
||||||
nla_put_be64(skb, NFTA_FLOWTABLE_HANDLE, cpu_to_be64(flowtable->handle),
|
nla_put_be64(skb, NFTA_FLOWTABLE_HANDLE, cpu_to_be64(flowtable->handle),
|
||||||
|
|
|
@ -24,3 +24,14 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||||
|
|
||||||
struct flow_offload {
|
struct flow_offload {
|
||||||
struct flow_offload_tuple_rhash tuplehash[FLOW_OFFLOAD_DIR_MAX];
|
struct flow_offload_tuple_rhash tuplehash[FLOW_OFFLOAD_DIR_MAX];
|
||||||
|
--- a/net/netfilter/nf_flow_table_core.c
|
||||||
|
+++ b/net/netfilter/nf_flow_table_core.c
|
||||||
|
@@ -370,7 +370,7 @@ static void nf_flow_offload_gc_step(stru
|
||||||
|
if (!teardown)
|
||||||
|
nf_ct_offload_timeout(flow);
|
||||||
|
|
||||||
|
- if (nf_flow_in_hw(flow) && !teardown)
|
||||||
|
+ if ((flow->flags & FLOW_OFFLOAD_KEEP) && !teardown)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (nf_flow_has_expired(flow) || teardown)
|
||||||
|
|
|
@ -52,7 +52,6 @@ CONFIG_BOUNCE=y
|
||||||
CONFIG_CLKDEV_LOOKUP=y
|
CONFIG_CLKDEV_LOOKUP=y
|
||||||
CONFIG_CLKSRC_QCOM=y
|
CONFIG_CLKSRC_QCOM=y
|
||||||
CONFIG_CLONE_BACKWARDS=y
|
CONFIG_CLONE_BACKWARDS=y
|
||||||
CONFIG_CMDLINE_OVERRIDE=y
|
|
||||||
CONFIG_COMMON_CLK=y
|
CONFIG_COMMON_CLK=y
|
||||||
CONFIG_COMMON_CLK_QCOM=y
|
CONFIG_COMMON_CLK_QCOM=y
|
||||||
CONFIG_COMPAT_32BIT_TIME=y
|
CONFIG_COMPAT_32BIT_TIME=y
|
||||||
|
@ -67,15 +66,14 @@ CONFIG_CPU_COPY_V6=y
|
||||||
CONFIG_CPU_CP15=y
|
CONFIG_CPU_CP15=y
|
||||||
CONFIG_CPU_CP15_MMU=y
|
CONFIG_CPU_CP15_MMU=y
|
||||||
CONFIG_CPU_FREQ=y
|
CONFIG_CPU_FREQ=y
|
||||||
|
CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
|
||||||
# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
|
# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
|
||||||
CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y
|
|
||||||
CONFIG_CPU_FREQ_GOV_ATTR_SET=y
|
CONFIG_CPU_FREQ_GOV_ATTR_SET=y
|
||||||
CONFIG_CPU_FREQ_GOV_COMMON=y
|
CONFIG_CPU_FREQ_GOV_COMMON=y
|
||||||
# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
|
# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
|
||||||
CONFIG_CPU_FREQ_GOV_ONDEMAND=y
|
CONFIG_CPU_FREQ_GOV_ONDEMAND=y
|
||||||
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
|
CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
|
||||||
# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
|
# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set
|
||||||
CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
|
|
||||||
# CONFIG_CPU_FREQ_GOV_USERSPACE is not set
|
# CONFIG_CPU_FREQ_GOV_USERSPACE is not set
|
||||||
CONFIG_CPU_FREQ_STAT=y
|
CONFIG_CPU_FREQ_STAT=y
|
||||||
CONFIG_CPU_HAS_ASID=y
|
CONFIG_CPU_HAS_ASID=y
|
||||||
|
@ -184,7 +182,7 @@ CONFIG_GPIOLIB=y
|
||||||
CONFIG_GPIOLIB_IRQCHIP=y
|
CONFIG_GPIOLIB_IRQCHIP=y
|
||||||
CONFIG_GPIO_74X164=y
|
CONFIG_GPIO_74X164=y
|
||||||
CONFIG_GPIO_WATCHDOG=y
|
CONFIG_GPIO_WATCHDOG=y
|
||||||
# CONFIG_GPIO_WATCHDOG_ARCH_INITCALL is not set
|
CONFIG_GPIO_WATCHDOG_ARCH_INITCALL=y
|
||||||
CONFIG_HANDLE_DOMAIN_IRQ=y
|
CONFIG_HANDLE_DOMAIN_IRQ=y
|
||||||
CONFIG_HARDEN_BRANCH_PREDICTOR=y
|
CONFIG_HARDEN_BRANCH_PREDICTOR=y
|
||||||
CONFIG_HARDIRQS_SW_RESEND=y
|
CONFIG_HARDIRQS_SW_RESEND=y
|
||||||
|
@ -198,6 +196,8 @@ CONFIG_HWSPINLOCK=y
|
||||||
CONFIG_HWSPINLOCK_QCOM=y
|
CONFIG_HWSPINLOCK_QCOM=y
|
||||||
CONFIG_HW_RANDOM=y
|
CONFIG_HW_RANDOM=y
|
||||||
CONFIG_HW_RANDOM_OPTEE=y
|
CONFIG_HW_RANDOM_OPTEE=y
|
||||||
|
CONFIG_HZ=100
|
||||||
|
CONFIG_HZ_100=y
|
||||||
CONFIG_HZ_FIXED=0
|
CONFIG_HZ_FIXED=0
|
||||||
CONFIG_I2C=y
|
CONFIG_I2C=y
|
||||||
CONFIG_I2C_BOARDINFO=y
|
CONFIG_I2C_BOARDINFO=y
|
||||||
|
@ -351,19 +351,6 @@ CONFIG_POWER_RESET_MSM=y
|
||||||
CONFIG_POWER_SUPPLY=y
|
CONFIG_POWER_SUPPLY=y
|
||||||
CONFIG_PPS=y
|
CONFIG_PPS=y
|
||||||
CONFIG_PRINTK_TIME=y
|
CONFIG_PRINTK_TIME=y
|
||||||
CONFIG_PSTORE=y
|
|
||||||
# CONFIG_PSTORE_842_COMPRESS is not set
|
|
||||||
CONFIG_PSTORE_COMPRESS=y
|
|
||||||
CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
|
|
||||||
# CONFIG_PSTORE_CONSOLE is not set
|
|
||||||
CONFIG_PSTORE_DEFLATE_COMPRESS=y
|
|
||||||
CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
|
|
||||||
# CONFIG_PSTORE_LZ4HC_COMPRESS is not set
|
|
||||||
# CONFIG_PSTORE_LZ4_COMPRESS is not set
|
|
||||||
# CONFIG_PSTORE_LZO_COMPRESS is not set
|
|
||||||
# CONFIG_PSTORE_PMSG is not set
|
|
||||||
CONFIG_PSTORE_RAM=y
|
|
||||||
# CONFIG_PSTORE_ZSTD_COMPRESS is not set
|
|
||||||
CONFIG_PTP_1588_CLOCK=y
|
CONFIG_PTP_1588_CLOCK=y
|
||||||
CONFIG_QCA807X_PHY=y
|
CONFIG_QCA807X_PHY=y
|
||||||
CONFIG_QCOM_A53PLL=y
|
CONFIG_QCOM_A53PLL=y
|
||||||
|
@ -396,9 +383,6 @@ CONFIG_RATIONAL=y
|
||||||
CONFIG_RCU_CPU_STALL_TIMEOUT=21
|
CONFIG_RCU_CPU_STALL_TIMEOUT=21
|
||||||
CONFIG_RCU_NEED_SEGCBLIST=y
|
CONFIG_RCU_NEED_SEGCBLIST=y
|
||||||
CONFIG_RCU_STALL_COMMON=y
|
CONFIG_RCU_STALL_COMMON=y
|
||||||
CONFIG_REED_SOLOMON=y
|
|
||||||
CONFIG_REED_SOLOMON_DEC8=y
|
|
||||||
CONFIG_REED_SOLOMON_ENC8=y
|
|
||||||
CONFIG_REFCOUNT_FULL=y
|
CONFIG_REFCOUNT_FULL=y
|
||||||
CONFIG_REGMAP=y
|
CONFIG_REGMAP=y
|
||||||
CONFIG_REGMAP_I2C=y
|
CONFIG_REGMAP_I2C=y
|
||||||
|
@ -460,7 +444,10 @@ CONFIG_TIMER_PROBE=y
|
||||||
CONFIG_TREE_RCU=y
|
CONFIG_TREE_RCU=y
|
||||||
CONFIG_TREE_SRCU=y
|
CONFIG_TREE_SRCU=y
|
||||||
CONFIG_UBIFS_FS=y
|
CONFIG_UBIFS_FS=y
|
||||||
# CONFIG_UCLAMP_TASK is not set
|
CONFIG_UBIFS_FS_ADVANCED_COMPR=y
|
||||||
|
CONFIG_UBIFS_FS_LZO=y
|
||||||
|
CONFIG_UBIFS_FS_ZLIB=y
|
||||||
|
CONFIG_UBIFS_FS_ZSTD=y
|
||||||
CONFIG_UEVENT_HELPER_PATH=""
|
CONFIG_UEVENT_HELPER_PATH=""
|
||||||
CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
|
CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
|
||||||
CONFIG_UNWINDER_ARM=y
|
CONFIG_UNWINDER_ARM=y
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue