[PATCH v2 2/5] Convert CONFIG_UDP_CHECKSUM to Kconfig

Simon Glass sjg at chromium.org
Sat Dec 18 19:27:49 CET 2021


This converts the following to Kconfig:
   CONFIG_UDP_CHECKSUM

Signed-off-by: Simon Glass <sjg at chromium.org>
---

(no changes since v1)

 configs/M5208EVBE_defconfig  | 1 +
 configs/M53017EVB_defconfig  | 1 +
 configs/M5329AFEE_defconfig  | 1 +
 configs/M5329BFEE_defconfig  | 1 +
 configs/M5373EVB_defconfig   | 1 +
 include/configs/M5208EVBE.h  | 2 --
 include/configs/M53017EVB.h  | 2 --
 include/configs/M5329EVB.h   | 2 --
 include/configs/M5373EVB.h   | 2 --
 include/configs/sandbox.h    | 1 -
 net/Kconfig                  | 7 +++++++
 net/net.c                    | 4 +---
 scripts/config_whitelist.txt | 1 -
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/configs/M5208EVBE_defconfig b/configs/M5208EVBE_defconfig
index cc307ce43b2..e79791cdfd0 100644
--- a/configs/M5208EVBE_defconfig
+++ b/configs/M5208EVBE_defconfig
@@ -19,6 +19,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_ENV_ADDR=0x2000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_UDP_CHECKSUM=y
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_FSL=y
 CONFIG_SYS_FSL_I2C_OFFSET=0x58000
diff --git a/configs/M53017EVB_defconfig b/configs/M53017EVB_defconfig
index 1cd48d6c4ae..b8292fdccff 100644
--- a/configs/M53017EVB_defconfig
+++ b/configs/M53017EVB_defconfig
@@ -21,6 +21,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_DATE=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_ENV_ADDR=0x40000
+CONFIG_UDP_CHECKSUM=y
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_FSL=y
 CONFIG_SYS_FSL_I2C_OFFSET=0x58000
diff --git a/configs/M5329AFEE_defconfig b/configs/M5329AFEE_defconfig
index 8a7a2d64f54..a6896650b19 100644
--- a/configs/M5329AFEE_defconfig
+++ b/configs/M5329AFEE_defconfig
@@ -22,6 +22,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_DATE=y
 CONFIG_ENV_ADDR=0x4000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_UDP_CHECKSUM=y
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_FSL=y
 CONFIG_SYS_FSL_I2C_OFFSET=0x58000
diff --git a/configs/M5329BFEE_defconfig b/configs/M5329BFEE_defconfig
index f40e86ff222..c640a3c38e8 100644
--- a/configs/M5329BFEE_defconfig
+++ b/configs/M5329BFEE_defconfig
@@ -22,6 +22,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_DATE=y
 CONFIG_ENV_ADDR=0x4000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_UDP_CHECKSUM=y
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_FSL=y
 CONFIG_SYS_FSL_I2C_OFFSET=0x58000
diff --git a/configs/M5373EVB_defconfig b/configs/M5373EVB_defconfig
index 8e61b72887d..c5aa3fd5e46 100644
--- a/configs/M5373EVB_defconfig
+++ b/configs/M5373EVB_defconfig
@@ -22,6 +22,7 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_DATE=y
 CONFIG_ENV_ADDR=0x4000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_UDP_CHECKSUM=y
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_FSL=y
 CONFIG_SYS_FSL_I2C_OFFSET=0x58000
diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h
index 6a69ac45aee..a9febe47a4c 100644
--- a/include/configs/M5208EVBE.h
+++ b/include/configs/M5208EVBE.h
@@ -41,8 +41,6 @@
 /* I2C */
 #define CONFIG_SYS_IMMR			CONFIG_SYS_MBAR
 
-#define CONFIG_UDP_CHECKSUM
-
 #ifdef CONFIG_MCFFEC
 #	define CONFIG_IPADDR	192.162.1.2
 #	define CONFIG_NETMASK	255.255.255.0
diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h
index 7b33677c551..cda6cbf14e9 100644
--- a/include/configs/M53017EVB.h
+++ b/include/configs/M53017EVB.h
@@ -56,8 +56,6 @@
 /* I2C */
 #define CONFIG_SYS_IMMR			CONFIG_SYS_MBAR
 
-#define CONFIG_UDP_CHECKSUM
-
 #ifdef CONFIG_MCFFEC
 #	define CONFIG_IPADDR	192.162.1.2
 #	define CONFIG_NETMASK	255.255.255.0
diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index 19d8cfe3217..f12edcc32f2 100644
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -50,8 +50,6 @@
 /* I2C */
 #define CONFIG_SYS_IMMR		CONFIG_SYS_MBAR
 
-#define CONFIG_UDP_CHECKSUM
-
 #ifdef CONFIG_MCFFEC
 #	define CONFIG_IPADDR	192.162.1.2
 #	define CONFIG_NETMASK	255.255.255.0
diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
index e2ddc4893e7..c6a3f71ec63 100644
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -52,8 +52,6 @@
 /* I2C */
 #define CONFIG_SYS_IMMR		CONFIG_SYS_MBAR
 
-#define CONFIG_UDP_CHECKSUM
-
 #ifdef CONFIG_MCFFEC
 #	define CONFIG_IPADDR	192.162.1.2
 #	define CONFIG_NETMASK	255.255.255.0
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 1dd21d5e925..2cb8a90f5ea 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -25,7 +25,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE	{4800, 9600, 19200, 38400, 57600,\
 					115200}
 
-#define CONFIG_UDP_CHECKSUM
 #define CONFIG_TIMESTAMP
 #define CONFIG_BOOTP_SERVERIP
 
diff --git a/net/Kconfig b/net/Kconfig
index fb6420f9bbe..3d3329912da 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -107,4 +107,11 @@ config KEEP_SERVERADDR
 	  enabled, when an ARP reply is received, the server's IP address is
 	  written there.
 
+config UDP_CHECKSUM
+	bool "Check the UDP checksum"
+	help
+	  Enable this to verify the checksum on UDP packets. If the checksum
+	  is wrong then the packet is discussed and an error is shown, like
+	  "UDP wrong checksum 29374a23 30ff3826"
+
 endif   # if NET
diff --git a/net/net.c b/net/net.c
index c2992a0908b..43e230aeb92 100644
--- a/net/net.c
+++ b/net/net.c
@@ -1264,8 +1264,7 @@ void net_process_received_packet(uchar *in_packet, int len)
 			   "received UDP (to=%pI4, from=%pI4, len=%d)\n",
 			   &dst_ip, &src_ip, len);
 
-#ifdef CONFIG_UDP_CHECKSUM
-		if (ip->udp_xsum != 0) {
+		if (IS_ENABLED(CONFIG_UDP_CHECKSUM) && ip->udp_xsum != 0) {
 			ulong   xsum;
 			u8 *sumptr;
 			ushort  sumlen;
@@ -1298,7 +1297,6 @@ void net_process_received_packet(uchar *in_packet, int len)
 				return;
 			}
 		}
-#endif
 
 #if defined(CONFIG_NETCONSOLE) && !defined(CONFIG_SPL_BUILD)
 		nc_input_packet((uchar *)ip + IP_UDP_HDR_SIZE,
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 3285d3cd30e..f0715614895 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -2946,7 +2946,6 @@ CONFIG_UBI_SIZE
 CONFIG_UBOOTPATH
 CONFIG_UBOOT_SECTOR_COUNT
 CONFIG_UBOOT_SECTOR_START
-CONFIG_UDP_CHECKSUM
 CONFIG_UEC_ETH
 CONFIG_UEC_ETH1
 CONFIG_UEC_ETH2
-- 
2.34.1.173.g76aa8bc2d0-goog



More information about the U-Boot mailing list