summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2026-07-06 18:26:12 -0600
committerTom Rini <[email protected]>2026-07-06 18:26:12 -0600
commitee5d46b45ec0c63f8f9dd1e816e0dac3452ccc3d (patch)
tree800cd9e204ca027144070101884c0d5d3c00130f /net
parentece349ade2973e220f524ce59e59711cc919263f (diff)
parenta18265f1ccb7a272721ed4286ed3b5a6182ff424 (diff)
Merge branch 'next'
Diffstat (limited to 'net')
-rw-r--r--net/Kconfig27
-rw-r--r--net/lwip/Kconfig2
2 files changed, 16 insertions, 13 deletions
diff --git a/net/Kconfig b/net/Kconfig
index e712a0dd2ac..386376ce884 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -114,15 +114,15 @@ config SERVERIP_FROM_PROXYDHCP
bool "Get serverip value from Proxy DHCP response"
help
Allows bootfile config to be fetched from Proxy DHCP server
- while IP is obtained from main DHCP server.
+ while IP is obtained from main DHCP server.
config SERVERIP_FROM_PROXYDHCP_DELAY_MS
int "# of additional milliseconds to wait for ProxyDHCP response"
default 100
help
Amount of additional time to wait for ProxyDHCP response after
- receiving response from main DHCP server. Has no effect if
- SERVERIP_FROM_PROXYDHCP is false.
+ receiving response from main DHCP server. Has no effect if
+ SERVERIP_FROM_PROXYDHCP is false.
config KEEP_SERVERADDR
bool "Write the server's MAC address to 'serveraddr'"
@@ -279,13 +279,16 @@ config TFTP_BLOCKSIZE
almost-MTU block sizes.
You can also activate CONFIG_IP_DEFRAG to set a larger block.
-endif # if NET
-
config SYS_RX_ETH_BUFFER
- int "Number of receive packet buffers"
- default 4
- help
- Defines the number of Ethernet receive buffers. On some Ethernet
- controllers it is recommended to set this value to 8 or even higher,
- since all buffers can be full shortly after enabling the interface on
- high Ethernet traffic.
+ int "Number of receive packet buffers"
+ default 8 if FSL_ENETC
+ default 4
+ help
+ Defines the number of Ethernet receive buffers. On some Ethernet
+ controllers (e.g. FSL_ENETC) it is recommended to set this value to 8
+ or even higher, since all buffers can be full shortly after enabling
+ the interface on high Ethernet traffic.
+
+ FSL_ENETC requires this value to be a multiple of 8.
+
+endif # if NET
diff --git a/net/lwip/Kconfig b/net/lwip/Kconfig
index 0cfd3eb2684..3beaf48ff2a 100644
--- a/net/lwip/Kconfig
+++ b/net/lwip/Kconfig
@@ -18,7 +18,7 @@ config LWIP_DEBUG
bool "Enable debug traces in the lwIP library"
help
Prints messages to the console regarding network packets that go in
- and out of the lwIP library.
+ and out of the lwIP library.
config LWIP_DEBUG_RXTX
bool "Dump packets sent and received by lwIP"