Skip to content

Commit 4296a59

Browse files
author
tabris
committed
netfilter-modules + make oldconfig
1 parent 83ccbbf commit 4296a59

22 files changed

+1084
-307
lines changed

config/kernel/linux-bcm2711-current.config

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ CONFIG_NF_CONNTRACK_SANE=m
181181
CONFIG_NF_CONNTRACK_SIP=m
182182
CONFIG_NF_CONNTRACK_TFTP=m
183183
CONFIG_NF_CT_NETLINK=m
184+
CONFIG_NETFILTER_NETLINK_GLUE_CT=y
184185
CONFIG_NF_TABLES=y
185186
CONFIG_NF_TABLES_INET=y
186187
CONFIG_NF_TABLES_NETDEV=y
@@ -214,6 +215,7 @@ CONFIG_NF_FLOW_TABLE=m
214215
CONFIG_NF_FLOW_TABLE_PROCFS=y
215216
CONFIG_NETFILTER_XTABLES_COMPAT=y
216217
CONFIG_NETFILTER_XT_SET=m
218+
CONFIG_NETFILTER_XT_TARGET_AUDIT=m
217219
CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
218220
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
219221
CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
@@ -872,11 +874,10 @@ CONFIG_I2C_BCM2708=m
872874
CONFIG_I2C_BCM2835=m
873875
CONFIG_I2C_BRCMSTB=m
874876
CONFIG_I2C_DESIGNWARE_CORE=m
877+
CONFIG_I2C_DESIGNWARE_SLAVE=y
875878
CONFIG_I2C_GPIO=m
876879
CONFIG_I2C_ROBOTFUZZ_OSIF=m
877880
CONFIG_I2C_TINY_USB=m
878-
CONFIG_I2C_SLAVE=y
879-
CONFIG_I2C_DESIGNWARE_SLAVE=y
880881
CONFIG_SPI=y
881882
CONFIG_SPI_BCM2835=m
882883
CONFIG_SPI_BCM2835AUX=m

config/kernel/linux-bcm2711-edge.config

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ CONFIG_ARM_RASPBERRYPI_CPUFREQ=y
7373
CONFIG_VIRTUALIZATION=y
7474
CONFIG_KVM=y
7575
CONFIG_KPROBES=y
76-
CONFIG_JUMP_LABEL=y
7776
CONFIG_MODULES=y
7877
CONFIG_MODULE_UNLOAD=y
7978
CONFIG_MODVERSIONS=y
@@ -86,7 +85,6 @@ CONFIG_BINFMT_MISC=m
8685
CONFIG_ZSWAP=y
8786
CONFIG_ZSWAP_DEFAULT_ON=y
8887
CONFIG_ZSWAP_COMPRESSOR_DEFAULT_ZSTD=y
89-
CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y
9088
# CONFIG_COMPAT_BRK is not set
9189
CONFIG_TRANSPARENT_HUGEPAGE=y
9290
CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
@@ -179,6 +177,7 @@ CONFIG_NF_CONNTRACK_SANE=m
179177
CONFIG_NF_CONNTRACK_SIP=m
180178
CONFIG_NF_CONNTRACK_TFTP=m
181179
CONFIG_NF_CT_NETLINK=m
180+
CONFIG_NETFILTER_NETLINK_GLUE_CT=y
182181
CONFIG_NF_TABLES=y
183182
CONFIG_NF_TABLES_INET=y
184183
CONFIG_NF_TABLES_NETDEV=y
@@ -212,6 +211,7 @@ CONFIG_NF_FLOW_TABLE=m
212211
CONFIG_NF_FLOW_TABLE_PROCFS=y
213212
CONFIG_NETFILTER_XTABLES_COMPAT=y
214213
CONFIG_NETFILTER_XT_SET=m
214+
CONFIG_NETFILTER_XT_TARGET_AUDIT=m
215215
CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
216216
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
217217
CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
@@ -266,6 +266,7 @@ CONFIG_NETFILTER_XT_MATCH_QUOTA=m
266266
CONFIG_NETFILTER_XT_MATCH_RATEEST=m
267267
CONFIG_NETFILTER_XT_MATCH_REALM=m
268268
CONFIG_NETFILTER_XT_MATCH_RECENT=m
269+
CONFIG_NETFILTER_XT_MATCH_SCTP=m
269270
CONFIG_NETFILTER_XT_MATCH_SOCKET=m
270271
CONFIG_NETFILTER_XT_MATCH_STATE=m
271272
CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
@@ -385,7 +386,6 @@ CONFIG_BRIDGE_EBT_REDIRECT=m
385386
CONFIG_BRIDGE_EBT_SNAT=m
386387
CONFIG_BRIDGE_EBT_LOG=m
387388
CONFIG_BRIDGE_EBT_NFLOG=m
388-
CONFIG_SCTP_COOKIE_HMAC_SHA1=y
389389
CONFIG_ATM=m
390390
CONFIG_L2TP=m
391391
CONFIG_L2TP_V3=y
@@ -857,12 +857,11 @@ CONFIG_I2C_BCM2708=m
857857
CONFIG_I2C_BCM2835=m
858858
CONFIG_I2C_BRCMSTB=m
859859
CONFIG_I2C_DESIGNWARE_CORE=m
860+
CONFIG_I2C_DESIGNWARE_SLAVE=y
860861
CONFIG_I2C_GPIO=m
861862
CONFIG_I2C_CP2615=m
862863
CONFIG_I2C_ROBOTFUZZ_OSIF=m
863864
CONFIG_I2C_TINY_USB=m
864-
CONFIG_I2C_SLAVE=y
865-
CONFIG_I2C_DESIGNWARE_SLAVE=y
866865
CONFIG_I2C_VIRTIO=m
867866
CONFIG_SPI=y
868867
CONFIG_SPI_BCM2835=m
@@ -1379,8 +1378,6 @@ CONFIG_TINYDRM_ILI9225=m
13791378
CONFIG_TINYDRM_ILI9341=m
13801379
CONFIG_TINYDRM_MI0283QT=m
13811380
CONFIG_TINYDRM_REPAPER=m
1382-
CONFIG_TINYDRM_ST7586=m
1383-
CONFIG_TINYDRM_ST7735R=m
13841381
CONFIG_DRM_GUD=m
13851382
CONFIG_FB=y
13861383
CONFIG_FB_BCM2708=y
@@ -1571,7 +1568,6 @@ CONFIG_HID_ICADE=m
15711568
CONFIG_HID_TWINHAN=m
15721569
CONFIG_HID_KENSINGTON=m
15731570
CONFIG_HID_LCPOWER=m
1574-
CONFIG_HID_LENOVO=m
15751571
CONFIG_HID_LETSKETCH=m
15761572
CONFIG_HID_LOGITECH=m
15771573
CONFIG_HID_LOGITECH_DJ=m
@@ -1634,10 +1630,10 @@ CONFIG_HID_SENSOR_HUB=m
16341630
CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
16351631
CONFIG_HID_ALPS=m
16361632
CONFIG_HID_MCP2221=m
1637-
CONFIG_HID_PID=y
1638-
CONFIG_USB_HIDDEV=y
16391633
CONFIG_I2C_HID_OF_ELAN=m
16401634
CONFIG_I2C_HID_OF_GOODIX=m
1635+
CONFIG_HID_PID=y
1636+
CONFIG_USB_HIDDEV=y
16411637
CONFIG_USB=y
16421638
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
16431639
CONFIG_USB_MON=m
@@ -1780,7 +1776,6 @@ CONFIG_MMC=y
17801776
CONFIG_MMC_BLOCK_MINORS=32
17811777
CONFIG_MMC_BCM2835_MMC=y
17821778
CONFIG_MMC_BCM2835_DMA=y
1783-
CONFIG_MMC_BCM2835_SDHOST=y
17841779
CONFIG_MMC_SDHCI=y
17851780
CONFIG_MMC_SDHCI_PLTFM=y
17861781
CONFIG_MMC_SDHCI_OF_DWCMSHC=m
@@ -1987,16 +1982,16 @@ CONFIG_STMPE_ADC=m
19871982
CONFIG_TI_ADC081C=m
19881983
CONFIG_TI_ADC0832=m
19891984
CONFIG_TI_ADC084S021=m
1990-
CONFIG_TI_ADC12138=m
19911985
CONFIG_TI_ADC108S102=m
1986+
CONFIG_TI_ADC12138=m
19921987
CONFIG_TI_ADC128S052=m
19931988
CONFIG_TI_ADC161S626=m
19941989
CONFIG_TI_ADS1015=m
1990+
CONFIG_TI_ADS124S08=m
1991+
CONFIG_TI_ADS131E08=m
19951992
CONFIG_TI_ADS7950=m
19961993
CONFIG_TI_ADS8344=m
19971994
CONFIG_TI_ADS8688=m
1998-
CONFIG_TI_ADS124S08=m
1999-
CONFIG_TI_ADS131E08=m
20001995
CONFIG_TI_TLC4541=m
20011996
CONFIG_TI_TSC2046=m
20021997
CONFIG_AD74413R=m
@@ -2153,7 +2148,6 @@ CONFIG_BCM2712_MIP=y
21532148
CONFIG_RESET_BRCMSTB=m
21542149
CONFIG_PHY_BRCM_USB=m
21552150
CONFIG_PHY_CADENCE_DPHY_RX=m
2156-
CONFIG_PHY_LAN966X_SERDES=m
21572151
CONFIG_PHY_MAPPHONE_MDM6600=m
21582152
CONFIG_PHY_OCELOT_SERDES=m
21592153
CONFIG_PHY_SAMSUNG_USB2=m
@@ -2248,7 +2242,6 @@ CONFIG_PSTORE=y
22482242
CONFIG_PSTORE_RAM=m
22492243
CONFIG_PSTORE_BLK=m
22502244
CONFIG_PSTORE_BLK_BLKDEV="m"
2251-
CONFIG_SYSV_FS=m
22522245
CONFIG_UFS_FS=m
22532246
CONFIG_EROFS_FS=m
22542247
# CONFIG_EROFS_FS_ZIP is not set
@@ -2283,7 +2276,6 @@ CONFIG_CIFS_POSIX=y
22832276
CONFIG_CIFS_DFS_UPCALL=y
22842277
CONFIG_CIFS_FSCACHE=y
22852278
CONFIG_SMB_SERVER=m
2286-
CONFIG_SMB_SERVER_KERBEROS5=y
22872279
CONFIG_CODA_FS=m
22882280
CONFIG_AFS_FS=m
22892281
CONFIG_AFS_FSCACHE=y
@@ -2381,7 +2373,6 @@ CONFIG_CRYPTO_AES_ARM64_BS=m
23812373
CONFIG_CRYPTO_SM4_ARM64_CE_BLK=m
23822374
CONFIG_CRYPTO_SM4_ARM64_NEON_BLK=m
23832375
# CONFIG_CRYPTO_HW is not set
2384-
CONFIG_CRC_ITU_T=y
23852376
CONFIG_XZ_DEC_TEST=m
23862377
CONFIG_DMA_CMA=y
23872378
CONFIG_CMA_SIZE_MBYTES=5
@@ -2408,5 +2399,4 @@ CONFIG_FUNCTION_ERROR_INJECTION=y
24082399
CONFIG_TEST_MIN_HEAP=m
24092400
CONFIG_TEST_XARRAY=m
24102401
CONFIG_TEST_BPF=m
2411-
CONFIG_TEST_BLACKHOLE_DEV=m
24122402
CONFIG_TEST_MEMCAT_P=m

config/kernel/linux-bcm2711-legacy.config

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ CONFIG_NF_CONNTRACK_SANE=m
164164
CONFIG_NF_CONNTRACK_SIP=m
165165
CONFIG_NF_CONNTRACK_TFTP=m
166166
CONFIG_NF_CT_NETLINK=m
167+
CONFIG_NETFILTER_NETLINK_GLUE_CT=y
167168
CONFIG_NF_TABLES=m
168169
CONFIG_NF_TABLES_INET=y
169170
CONFIG_NF_TABLES_NETDEV=y
@@ -187,13 +188,16 @@ CONFIG_NFT_XFRM=m
187188
CONFIG_NFT_SOCKET=m
188189
CONFIG_NFT_OSF=m
189190
CONFIG_NFT_TPROXY=m
191+
CONFIG_NFT_SYNPROXY=m
190192
CONFIG_NFT_DUP_NETDEV=m
191193
CONFIG_NFT_FWD_NETDEV=m
192194
CONFIG_NFT_FIB_NETDEV=m
193195
CONFIG_NFT_REJECT_NETDEV=m
194196
CONFIG_NF_FLOW_TABLE_INET=m
195197
CONFIG_NF_FLOW_TABLE=m
198+
CONFIG_NETFILTER_XTABLES_COMPAT=y
196199
CONFIG_NETFILTER_XT_SET=m
200+
CONFIG_NETFILTER_XT_TARGET_AUDIT=m
197201
CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
198202
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
199203
CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
@@ -517,6 +521,7 @@ CONFIG_MTD_UBI=m
517521
CONFIG_OF_CONFIGFS=y
518522
CONFIG_ZRAM=m
519523
CONFIG_ZRAM_WRITEBACK=y
524+
CONFIG_ZRAM_MEMORY_TRACKING=y
520525
CONFIG_BLK_DEV_LOOP=y
521526
CONFIG_BLK_DEV_DRBD=m
522527
CONFIG_BLK_DEV_NBD=m
@@ -814,14 +819,12 @@ CONFIG_I2C_CHARDEV=m
814819
CONFIG_I2C_MUX_GPMUX=m
815820
CONFIG_I2C_MUX_PCA954x=m
816821
CONFIG_I2C_MUX_PINCTRL=m
817-
CONFIG_I2C_DESIGNWARE_CORE=m
818822
CONFIG_I2C_GPIO=m
819823
CONFIG_I2C_CP2615=m
820824
CONFIG_I2C_ROBOTFUZZ_OSIF=m
821825
CONFIG_I2C_TINY_USB=m
822-
CONFIG_I2C_SLAVE=y
823-
CONFIG_I2C_DESIGNWARE_SLAVE=y
824826
CONFIG_I2C_VIRTIO=m
827+
CONFIG_I2C_SLAVE=y
825828
CONFIG_SPI=y
826829
CONFIG_SPI_DESIGNWARE=m
827830
CONFIG_SPI_DW_DMA=y

0 commit comments

Comments
 (0)