net: Convert CONFIG_IP_DEFRAG to Kconfig

Convert CONFIG_IP_DEFRAG to Kconfig, update defconfigs, headers
and whitelist. This patch is a follow-up on a patch by Christian
Gmeiner with the added config/header/whitelist updates.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Reported-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Cc: Joe Hershberger <joe.hershberger@ni.com>

diff --git a/configs/apalis-imx8qm_defconfig b/configs/apalis-imx8qm_defconfig
index f3dbaf0101f2a04976237197ef361191db4c0ca8..7848b68c21b74ac5b99efc3fc0641ccfe2b82610 100644 (file)
--- a/configs/apalis-imx8qm_defconfig
+++ b/configs/apalis-imx8qm_defconfig
@@ -25,6 +25,7 @@ CONFIG_CMD_UUID=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qm-apalis"
 CONFIG_ENV_IS_IN_MMC=y
+CONFIG_IP_DEFRAG=y
 CONFIG_CLK_IMX8=y
 CONFIG_CPU=y
 CONFIG_DM_GPIO=y

diff --git a/configs/apalis-tk1_defconfig b/configs/apalis-tk1_defconfig
index 946858e48e3b491ae89e9b8eadebfbafaf72436c..141260f44b76de13f65ccacfad5f719163d9f357 100644 (file)
--- a/configs/apalis-tk1_defconfig
+++ b/configs/apalis-tk1_defconfig
@@ -31,6 +31,7 @@ CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_OF_LIVE=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra124-apalis"
+CONFIG_IP_DEFRAG=y
 CONFIG_SPL_DM=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y

diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig
index bcf7444311d707b0e90e7dc37230c21928813bc9..0daf758c27bd1f6781ec397bd1821a61b5c8cff9 100644 (file)
--- a/configs/apalis_imx6_defconfig
+++ b/configs/apalis_imx6_defconfig
@@ -54,6 +54,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="imx6-apalis"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+CONFIG_IP_DEFRAG=y
 CONFIG_DWC_AHSATA=y
 CONFIG_DFU_MMC=y
 CONFIG_DM_GPIO=y

diff --git a/configs/apalis_t30_defconfig b/configs/apalis_t30_defconfig
index d231ccdb49bbb594c264fa3d086c28c502d5f0ae..cd1a679cb352d79ab1c6aa1558972eeb711864b1 100644 (file)
--- a/configs/apalis_t30_defconfig
+++ b/configs/apalis_t30_defconfig
@@ -28,6 +28,7 @@ CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_OF_LIVE=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-apalis"
+CONFIG_IP_DEFRAG=y
 CONFIG_SPL_DM=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y

diff --git a/configs/colibri-imx6ull_defconfig b/configs/colibri-imx6ull_defconfig
index 133df9e72312a0027c4e46aace82610d423ca08e..e2755ecab56fe5e75831b242f5d2683ae21a0ec5 100644 (file)
--- a/configs/colibri-imx6ull_defconfig
+++ b/configs/colibri-imx6ull_defconfig
@@ -46,6 +46,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="imx6ull-colibri"
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+CONFIG_IP_DEFRAG=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_NAND=y
 CONFIG_DM_GPIO=y

diff --git a/configs/colibri-imx8qxp_defconfig b/configs/colibri-imx8qxp_defconfig
index e69ee5eab9f78c01a3206cb71967650a2a2f3672..f73236ca05e494d233d1d6f6cfd99631023c9006 100644 (file)
--- a/configs/colibri-imx8qxp_defconfig
+++ b/configs/colibri-imx8qxp_defconfig
@@ -24,6 +24,7 @@ CONFIG_CMD_UUID=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8qxp-colibri"
 CONFIG_ENV_IS_IN_MMC=y
+CONFIG_IP_DEFRAG=y
 CONFIG_CLK_IMX8=y
 CONFIG_CPU=y
 CONFIG_DM_GPIO=y

diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig
index 59d4ab0a041b92a3a0a9738bf8e0622223a00f92..712db4514e5abe1eec6a5fcc598ebb0f42b9b188 100644 (file)
--- a/configs/colibri_imx6_defconfig
+++ b/configs/colibri_imx6_defconfig
@@ -54,6 +54,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="imx6-colibri"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+CONFIG_IP_DEFRAG=y
 CONFIG_DFU_MMC=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y

diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig
index 5b0d09156956c037c33a1ecd3d743467f5941c79..25191d1a9184a9c28602dbb13e8e8a36ec1cb5c3 100644 (file)
--- a/configs/colibri_imx7_defconfig
+++ b/configs/colibri_imx7_defconfig
@@ -46,6 +46,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="imx7-colibri-rawnand"
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+CONFIG_IP_DEFRAG=y
 CONFIG_FSL_CAAM=y
 CONFIG_DFU_NAND=y
 CONFIG_DM_GPIO=y

diff --git a/configs/colibri_imx7_emmc_defconfig b/configs/colibri_imx7_emmc_defconfig
index bb11524794332a80ef14c14055cf06607d5b382b..23228246d80e8ff74d16ed46719c72725a52f4ee 100644 (file)
--- a/configs/colibri_imx7_emmc_defconfig
+++ b/configs/colibri_imx7_emmc_defconfig
@@ -41,6 +41,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="imx7-colibri-emmc"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+CONFIG_IP_DEFRAG=y
 CONFIG_FSL_CAAM=y
 CONFIG_DFU_MMC=y
 CONFIG_DM_GPIO=y

diff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig
index e652ebc5a57759c5405d2e310084fc0e7afda463..8247248f1c42f1f98bf7e7982d6d806ee0d8d5d0 100644 (file)
--- a/configs/colibri_t20_defconfig
+++ b/configs/colibri_t20_defconfig
@@ -36,6 +36,7 @@ CONFIG_CMD_UBI=y
 CONFIG_OF_LIVE=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra20-colibri"
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_IP_DEFRAG=y
 CONFIG_SPL_DM=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y

diff --git a/configs/colibri_t30_defconfig b/configs/colibri_t30_defconfig
index 99be27823d57c1a4aca709b54daecf4a35a4cc44..3d25f10e1a55d72d39cfcbdb5c4a98bb7568c007 100644 (file)
--- a/configs/colibri_t30_defconfig
+++ b/configs/colibri_t30_defconfig
@@ -27,6 +27,7 @@ CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_OF_LIVE=y
 CONFIG_DEFAULT_DEVICE_TREE="tegra30-colibri"
+CONFIG_IP_DEFRAG=y
 CONFIG_SPL_DM=y
 CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y

diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig
index 1bc3bd38013db0987c3d6dbda96f5b37cad24bce..bfb1eaf0e76db7cf9abf0fe2f735d18a2f5b6e2e 100644 (file)
--- a/configs/sandbox64_defconfig
+++ b/configs/sandbox64_defconfig
@@ -74,6 +74,7 @@ CONFIG_OF_LIVE=y
 CONFIG_OF_HOSTFILE=y
 CONFIG_DEFAULT_DEVICE_TREE="sandbox64"
 CONFIG_NETCONSOLE=y
+CONFIG_IP_DEFRAG=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_DEVRES=y

diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index 4877f1099a145b470795894d75d1e62f5ef24d39..4cffa2c604954f17d513499aeb90f6824f0fe39d 100644 (file)
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -79,6 +79,7 @@ CONFIG_OF_LIVE=y
 CONFIG_OF_HOSTFILE=y
 CONFIG_DEFAULT_DEVICE_TREE="sandbox"
 CONFIG_NETCONSOLE=y
+CONFIG_IP_DEFRAG=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_DEVRES=y

diff --git a/configs/sandbox_flattree_defconfig b/configs/sandbox_flattree_defconfig
index 40593ee3a178b15a44ec8aeeb331210401c4c89d..dda6832f834a3f2d2f1022cf55865e3704b59990 100644 (file)
--- a/configs/sandbox_flattree_defconfig
+++ b/configs/sandbox_flattree_defconfig
@@ -59,6 +59,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_OF_HOSTFILE=y
 CONFIG_DEFAULT_DEVICE_TREE="sandbox"
 CONFIG_NETCONSOLE=y
+CONFIG_IP_DEFRAG=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_DEVRES=y

diff --git a/configs/sandbox_noblk_defconfig b/configs/sandbox_noblk_defconfig
index 24ff4b41daf9ea296e37704cda2ad892bb233179..ec8726b798625d0ac17389b8e9c238cef5bfa129 100644 (file)
--- a/configs/sandbox_noblk_defconfig
+++ b/configs/sandbox_noblk_defconfig
@@ -65,6 +65,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_OF_HOSTFILE=y
 CONFIG_DEFAULT_DEVICE_TREE="sandbox"
 CONFIG_NETCONSOLE=y
+CONFIG_IP_DEFRAG=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_DEVRES=y

diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig
index bebd78d55be5b6661eece9dac0dee1ca6ec49053..3e0bf5d3b50a75d085bde2326fdbe3b71b11dce6 100644 (file)
--- a/configs/sandbox_spl_defconfig
+++ b/configs/sandbox_spl_defconfig
@@ -76,6 +76,7 @@ CONFIG_OF_HOSTFILE=y
 CONFIG_DEFAULT_DEVICE_TREE="sandbox"
 CONFIG_SPL_OF_PLATDATA=y
 CONFIG_NETCONSOLE=y
+CONFIG_IP_DEFRAG=y
 CONFIG_SPL_DM=y
 CONFIG_REGMAP=y
 CONFIG_SPL_REGMAP=y

diff --git a/configs/tools-only_defconfig b/configs/tools-only_defconfig
index fb0607678541bf7887926bbf027e0fcc85274237..aa73661a92f663e46e932d5bdf7394b943254f30 100644 (file)
--- a/configs/tools-only_defconfig
+++ b/configs/tools-only_defconfig
@@ -9,6 +9,7 @@ CONFIG_FIT_SIGNATURE=y
 CONFIG_OF_CONTROL=y
 CONFIG_OF_HOSTFILE=y
 CONFIG_DEFAULT_DEVICE_TREE="sandbox"
+CONFIG_IP_DEFRAG=y
 # CONFIG_UDP_FUNCTION_FASTBOOT is not set
 CONFIG_SANDBOX_GPIO=y
 CONFIG_DM_I2C_COMPAT=y

diff --git a/configs/xilinx_versal_virt_defconfig b/configs/xilinx_versal_virt_defconfig
index b0b36a084f7bd182f4f53d09e89bda4ab24d911c..9000573cdad2918ba391efd2bf51049f2aefc251 100644 (file)
--- a/configs/xilinx_versal_virt_defconfig
+++ b/configs/xilinx_versal_virt_defconfig
@@ -42,6 +42,7 @@ CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
 CONFIG_OF_BOARD=y
 CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_IP_DEFRAG=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_DM_GPIO=y
 CONFIG_DM_I2C=y

diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h
index be2c5a2293f1c78e1323e5e547df20047b070f49..8cdd7c7a4b0e10f898d2157f3678a9d26172d2b5 100644 (file)
--- a/include/configs/apalis-imx8.h
+++ b/include/configs/apalis-imx8.h
@@ -29,7 +29,6 @@
 /* Networking */
 #define FEC_QUIRK_ENET_MAC
 
-#define CONFIG_IP_DEFRAG
 #define CONFIG_TFTP_BLOCKSIZE          SZ_4K
 #define CONFIG_TFTP_TSIZE
 

diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h
index 490ca64b1007efe2001876204d036799733e1e3f..51d1261cae6f158c435c21fbd1046cf99c029f77 100644 (file)
--- a/include/configs/apalis-tk1.h
+++ b/include/configs/apalis-tk1.h
@@ -31,7 +31,6 @@
 #define CONFIG_E1000_NO_NVM
 
 /* General networking support */
-#define CONFIG_IP_DEFRAG
 #define CONFIG_TFTP_BLOCKSIZE          16352
 #define CONFIG_TFTP_TSIZE
 

diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 54094e495a9612635fb60dcdfa10afdb0afa28b6..0c01fdcbd2c1df1bb932b621ea152e152858e152 100644 (file)
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -59,7 +59,6 @@
 #define CONFIG_FEC_XCV_TYPE            RGMII
 #define CONFIG_ETHPRIME                        "FEC"
 #define CONFIG_FEC_MXC_PHYADDR         6
-#define CONFIG_IP_DEFRAG
 #define CONFIG_TFTP_BLOCKSIZE          4096
 #define CONFIG_TFTP_TSIZE
 

diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h
index 77a5968cc2b229f438e1584258b2a2ebc91c6d9a..c085be8b5f9bd67f5f1d4e9ac80b3f27d9e400eb 100644 (file)
--- a/include/configs/apalis_t30.h
+++ b/include/configs/apalis_t30.h
@@ -28,7 +28,6 @@
 #define CONFIG_E1000_NO_NVM
 
 /* General networking support */
-#define CONFIG_IP_DEFRAG
 #define CONFIG_TFTP_BLOCKSIZE          16352
 #define CONFIG_TFTP_TSIZE
 

diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h
index b221e118fa419ae2b9c7f15d5251facf18976a3f..20f5440cb25e2f6072e0ed53003bb8ea19b2e11a 100644 (file)
--- a/include/configs/colibri-imx6ull.h
+++ b/include/configs/colibri-imx6ull.h
@@ -19,7 +19,6 @@
 #define CONFIG_SYS_MALLOC_LEN          (32 * SZ_1M)
 
 /* Network */
-#define CONFIG_IP_DEFRAG
 #define CONFIG_TFTP_BLOCKSIZE          16352
 #define CONFIG_TFTP_TSIZE
 

diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h
index c6a38d5118d270ebfe23aecd4bba195de9edd385..8e7454433de56fe2c6507dc81af89df44e5078d3 100644 (file)
--- a/include/configs/colibri-imx8x.h
+++ b/include/configs/colibri-imx8x.h
@@ -29,7 +29,6 @@
 /* Networking */
 #define FEC_QUIRK_ENET_MAC
 
-#define CONFIG_IP_DEFRAG
 #define CONFIG_TFTP_BLOCKSIZE          SZ_4K
 #define CONFIG_TFTP_TSIZE
 

diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 1cdf83d82d3964ffbc32a4a20a2500aec013471a..2dfb7bd861c1026de299c96652b5b7e0bd13e31c 100644 (file)
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -50,7 +50,6 @@
 #define CONFIG_FEC_XCV_TYPE            RMII
 #define CONFIG_ETHPRIME                        "FEC"
 #define CONFIG_FEC_MXC_PHYADDR         1
-#define CONFIG_IP_DEFRAG
 #define CONFIG_TFTP_BLOCKSIZE          16352
 #define CONFIG_TFTP_TSIZE
 

diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index 545f506e97f75bc27c1b6a69f1c0eb56cf5e877a..c19e27b9deefb9bac36eb74029efd045c26ca785 100644 (file)
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -22,7 +22,6 @@
 #define CONFIG_ETHPRIME                 "FEC"
 #define CONFIG_FEC_MXC_PHYADDR          0
 
-#define CONFIG_IP_DEFRAG
 #define CONFIG_TFTP_BLOCKSIZE          16352
 #define CONFIG_TFTP_TSIZE
 

diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
index 6c4e9d415404222966b977f55f31dff60d329ddb..dd9f7225a039f202491ec67efb14eed5acd47abe 100644 (file)
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -18,7 +18,6 @@
 #define CONFIG_MACH_TYPE               MACH_TYPE_COLIBRI_TEGRA2
 
 /* General networking support */
-#define CONFIG_IP_DEFRAG
 #define CONFIG_TFTP_BLOCKSIZE          1536
 #define CONFIG_TFTP_TSIZE
 

diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h
index 7ece00e646ac406c57f5dc614c958bc324ccd14f..a816ade3101c460c493680426659b825703fc0ad 100644 (file)
--- a/include/configs/colibri_t30.h
+++ b/include/configs/colibri_t30.h
@@ -27,7 +27,6 @@
 #define CONFIG_SYS_MMC_ENV_PART                1
 
 /* General networking support */
-#define CONFIG_IP_DEFRAG
 #define CONFIG_TFTP_BLOCKSIZE          16352
 #define CONFIG_TFTP_TSIZE
 

diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index bf03baefe83b9d9d994112fee0fa5208a84f899a..50affaf1a826db0a5df0264ad18730071249e77b 100644 (file)
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -71,7 +71,6 @@
 #define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_BOOTP_SERVERIP
-#define CONFIG_IP_DEFRAG
 
 #ifndef SANDBOX_NO_SDL
 #define CONFIG_SANDBOX_SDL

diff --git a/include/configs/xilinx_versal.h b/include/configs/xilinx_versal.h
index 2cc36e793b61f5e357b345d3583bbb35fb5b55f2..b2521df3db0a32bf3933ea0408b30b7b66a01e57 100644 (file)
--- a/include/configs/xilinx_versal.h
+++ b/include/configs/xilinx_versal.h
@@ -41,7 +41,6 @@
 #define CONFIG_BOOTP_BOOTFILESIZE
 #define CONFIG_BOOTP_MAY_FAIL
 
-#define CONFIG_IP_DEFRAG
 #define CONFIG_TFTP_BLOCKSIZE  4096
 
 /* Miscellaneous configurable options */

diff --git a/net/Kconfig b/net/Kconfig
index f2363e525678aded4e28e23e58e6e77bde4e7c93..1a6fda9ebcf8423bb950aa9da2f6d67d31b77ed6 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -22,4 +22,11 @@ config NETCONSOLE
          Support the 'nc' input/output device for networked console.
          See README.NetConsole for details.
 
+config IP_DEFRAG
+       bool "Support IP datagram reassembly"
+       default n
+       help
+         Selecting this will enable IP datagram reassembly according
+         to the algorithm in RFC815.
+
 endif   # if NET

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 8651d569c50b2595b23e469e2d332a789994011c..8ec700f6cadb7334dbd74b6e3d6fd4c48deb7715 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -927,7 +927,6 @@ CONFIG_IPAM390_GPIO_BOOTMODE
 CONFIG_IPAM390_GPIO_LED_GREEN
 CONFIG_IPAM390_GPIO_LED_RED
 CONFIG_IPROC
-CONFIG_IP_DEFRAG
 CONFIG_IRAM_BASE
 CONFIG_IRAM_END
 CONFIG_IRAM_SIZE