[Components][lwip]Add lwip-2.2.1 support by Tim-Wang38 · Pull Request #11797 · RT-Thread/rt-thread

Tim-Wang38 · 2026-09-11T08:31:04Z

拉取/合并请求描述：(PR description) Fixed #11588

[

为什么提交这份PR (why to submit this PR)

Add the latest lwip support

请提供验证的bsp和config (provide the config and bsp)

BSP: bsp/nxp/imx/imxrt/imxrt1180-nxp-evk/m7
.config:
BSP_USING_ETH
RT_USING_SAL
RT_USING_NETDEV
RT_USING_LWIP

当前拉取/合并请求的状态 Intent for your PR

必须选择一项 Choose one (Mandatory):

本拉取/合并请求是一个草稿版本 This PR is for a code-review and is intended to get feedback
本拉取/合并请求是一个成熟版本 This PR is mature, and ready to be integrated into the repo

代码质量 Code Quality：

我在这个拉取/合并请求中已经考虑了 As part of this pull request, I've considered the following:

已经仔细查看过代码改动的对比 Already check the difference between PR and old code
代码风格正确，包括缩进空格，命名及其他风格 Style guide is adhered to, including spacing, naming and other styles
没有垃圾代码，代码尽量精简，不包含#if 0代码，不包含已经被注释了的代码 All redundant code is removed and cleaned up
所有变更均有原因及合理的，并且不会影响到其他软件组件代码或BSP All modifications are justified and not affect other components or BSP
对难懂代码均提供对应的注释 I've commented appropriately where code is tricky
代码是高质量的 Code in this PR is of high quality
已经使用clang-format 源码格式化工具确保格式符合RT-Thread代码规范 This PR has been formatted with clang-format and complies with RT-Thread code specification
如果是新增bsp, 已经添加ci检查到.github/ALL_BSP_COMPILE.json 详细请参考链接BSP自查

Verbatim upstream lwIP 2.2.1 official release (STABLE-2.2.1), complete with apps/, test/ and Filelists.

CLAassistant · 2026-09-11T08:31:13Z

All committers have signed the CLA.

github-actions · 2026-09-11T08:31:14Z

👋 感谢您对 RT-Thread 的贡献！Thank you for your contribution to RT-Thread!

为确保代码符合 RT-Thread 的编码规范，请在你的仓库中执行以下步骤运行代码格式化工作流（如果格式化CI运行失败）。
To ensure your code complies with RT-Thread's coding style, please run the code formatting workflow by following the steps below (If the formatting of CI fails to run).

🛠 操作步骤 | Steps

前往 Actions 页面 | Go to the Actions page
点击进入工作流 → | Click to open workflow →
点击 Run workflow | Click Run workflow

Use workflow from 保持默认分支（通常为 master）
Keep the default branch (usually master) in Use workflow from
在 branch 输入框填写 PR 分支 components/add_lwip-2.2.1
Enter PR branch components/add_lwip-2.2.1 in the branch field
设置需排除的文件/目录（目录请以"/"结尾）
Set files/directories to exclude (directories should end with "/")

等待工作流完成 | Wait for the workflow to complete
格式化后的代码将作为独立提交推送至你的分支。
The formatting changes will be pushed to your branch as a separate commit.

完成后，提交将自动更新至 components/add_lwip-2.2.1 分支，关联的 Pull Request 也会同步更新。
Once completed, commits will be pushed to the components/add_lwip-2.2.1 branch automatically, and the related Pull Request will be updated.

如有问题欢迎联系我们，再次感谢您的贡献！💐
If you have any questions, feel free to reach out. Thanks again for your contribution!

github-actions · 2026-09-11T08:31:18Z

📌 Code Review Assignment

🏷️ Tag: components

Reviewers: @Maihuanyi

Changed Files (Click to expand)

components/net/lwip/.clang-format-ignore
components/net/lwip/Kconfig
components/net/lwip/lwip-2.2.1/BUILDING
components/net/lwip/lwip-2.2.1/CHANGELOG
components/net/lwip/lwip-2.2.1/COPYING
components/net/lwip/lwip-2.2.1/FEATURES
components/net/lwip/lwip-2.2.1/FILES
components/net/lwip/lwip-2.2.1/README
components/net/lwip/lwip-2.2.1/SConscript
components/net/lwip/lwip-2.2.1/UPGRADING
components/net/lwip/lwip-2.2.1/doc/FILES
components/net/lwip/lwip-2.2.1/doc/NO_SYS_SampleCode.c
components/net/lwip/lwip-2.2.1/doc/ZeroCopyRx.c
components/net/lwip/lwip-2.2.1/doc/contrib.txt
components/net/lwip/lwip-2.2.1/doc/doxygen/generate.bat
components/net/lwip/lwip-2.2.1/doc/doxygen/generate.sh
components/net/lwip/lwip-2.2.1/doc/doxygen/lwip.Doxyfile
components/net/lwip/lwip-2.2.1/doc/doxygen/lwip.Doxyfile.cmake.in
components/net/lwip/lwip-2.2.1/doc/doxygen/main_page.h
components/net/lwip/lwip-2.2.1/doc/doxygen/output/index.html
components/net/lwip/lwip-2.2.1/doc/mdns.txt
components/net/lwip/lwip-2.2.1/doc/mqtt_client.txt
components/net/lwip/lwip-2.2.1/doc/ppp.txt
components/net/lwip/lwip-2.2.1/doc/savannah.txt
components/net/lwip/lwip-2.2.1/src/FILES
components/net/lwip/lwip-2.2.1/src/Filelists.cmake
components/net/lwip/lwip-2.2.1/src/Filelists.mk
components/net/lwip/lwip-2.2.1/src/api/api_lib.c
components/net/lwip/lwip-2.2.1/src/api/api_msg.c
components/net/lwip/lwip-2.2.1/src/api/err.c

📊 Current Review Status (Last Updated: 2026-09-23 15:57 CST)

⌛ @Maihuanyi Pending Review

📝 Review Instructions

维护者可以通过单击此处来刷新审查状态: 🔄 刷新状态
Maintainers can refresh the review status by clicking here: 🔄 Refresh Status
确认审核通过后评论 LGTM/lgtm
Comment LGTM/lgtm after confirming approval
PR合并前需至少一位维护者确认
PR must be confirmed by at least one maintainer before merging

ℹ️ 刷新CI状态操作需要具备仓库写入权限。
ℹ️ Refresh CI status operation requires repository Write permission.

github-actions · 2026-09-14T15:50:49Z

MemBrowse Memory Report

stm32f407-rt-spark

CODE: .text +88 B (+0.1%, 86,060 B / 1,048,576 B, total: 8% used)
No memory changes detected for:
at32f415-start
esp32-c3
gd32105r-start
hc32f334
hpmicro-hpm5301evklite
infineon-psoc6
k230
loongson-ls1cdev
nordic-nrf51822
nuvoton-m487
nxp-lpc1114
qemu-virt64-aarch64
raspberry-pico-rp2040
renesas-ra2l1
simulator
stm32l475-atk-pandora-llvm
wch-ch32v208w-r0
x86
xuantie-e901plus

….1.2 - Kconfig: RT_USING_LWIP221 choice, RT_USING_LWIP_VER_NUM=0x20201 - SConscript for lwip-2.2.1 (acd.c, mdns split files, tftp.c) - replay RTT patch set from lwip-2.1.2 onto 2.2.1 - import RTT ping.c and tftp_port.c (adapted to 2.2.x TFTP API) - SAL: version-gated netconn socket accessor (callback_arg union >= 2.2.0) - lwipopts: DHCP ACD (RFC 5227) and MEMP_NUM_SYS_TIMEOUT version gates

CYFS3 · 2026-09-22T02:44:30Z

components/net/lwip/lwip-2.2.1/doc/doxygen/output/html
这个文件夹下的都可以删掉吧

Tim-Wang38 · 2026-09-22T12:49:15Z

已经删除html目录下冗余文件

CYFS3

其他LGTM

CYFS3 · 2026-09-22T13:53:24Z

+ *
+ * @note This function will block until all data can be sent.
+ */
+u32_t sio_write(sio_fd_t fd, const u8_t *data, u32_t len);


rt-thread/components/net/lwip/port/sys_arch.c

Lines 603 to 607 in 005d291

u32_t sio_write(sio_fd_t fd, u8_t *buf, u32_t size)

{

RT_ASSERT(fd != RT_NULL);

return rt_device_write((rt_device_t)fd, 0, buf, size);

}

这一块应该要对2.2.1版本做个兼容

CYFS3 · 2026-09-22T13:59:13Z

+   * Keep RT's &name[1] offset; upstream 2.2.1 added an atoi-failure check
+   * which is adapted here for the 2-char naming convention. */
+  num = (u8_t)atoi(&name[1]);
+  if (!num && (name[1] != '0')) {


https://github.com/lwip-tcpip/lwip/blob/d08f4773edd0182b7910fc8f046eed82ffcd67c9/src/core/netif.c#L1769-L1772
这个内容跟最新的lwip对齐一下，不然ppp新增网卡会失败

如果使用最新的lwip的代码的话这里普通两字符名称的网卡比如‘e0’会返回null，这里添加一段代码做检查是否可行？
const char *num_str = name;
while (*num_str != '\0' && !lwip_isdigit((unsigned char)*num_str)) {
num_str++;
}
num = (u8_t)atoi(num_str);
if (!num && (num_str != '0')) {
/ this means atoi has failed */
return NULL;
}

如果使用最新的lwip的代码的话这里普通两字符名称的网卡比如‘e0’会返回null，这里添加一段代码做检查是否可行？ const char *num_str = name; while (*num_str != '\0' && !lwip_isdigit((unsigned char)*num_str)) { num_str++; } num = (u8_t)atoi(num_str); if (!num && (num_str != '0')) { / this means atoi has failed */ return NULL; }

也许可以先不管这个ppp相关的，因为我看前几个版本应该也会有类似的问题，这个看看后续有什么方案在改进。可以先把lwip2.2.1这个先合并到主仓

好的，我先提交sio_write相关的修改

CYFS3 · 2026-09-22T14:00:15Z

在STM32H7上面验证lwip2.2.1没有问题

[lwip] import pristine lwIP 2.2.1 source tree

dd7b795

Verbatim upstream lwIP 2.2.1 official release (STABLE-2.2.1), complete with apps/, test/ and Filelists.

github-actions Bot added component: net Component component: drivers/usb component: net/lwip component: net/sal component: drivers labels Sep 11, 2026

Tim-Wang38 force-pushed the components/add_lwip-2.2.1 branch from 3d388ec to 04a4e19 Compare September 15, 2026 03:19

Tim-Wang38 force-pushed the components/add_lwip-2.2.1 branch from 04a4e19 to 639c28a Compare September 16, 2026 02:42

Tim-Wang38 closed this Sep 16, 2026

Tim-Wang38 reopened this Sep 16, 2026

[lwip] clean lwip doc files

d7b2c6c

CYFS3 approved these changes Sep 22, 2026

View reviewed changes

[lwip] fix sio_write signature conflict

529259e

Navigation Menu

[Components][lwip]Add lwip-2.2.1 support - #11797

[Components][lwip]Add lwip-2.2.1 support#11797
Tim-Wang38 wants to merge 4 commits into
RT-Thread:masterfrom
Tim-Wang38:components/add_lwip-2.2.1

Tim-Wang38 commented Sep 11, 2026 •

edited

Loading

Uh oh!

CLAassistant commented Sep 11, 2026 •

edited

Loading

Uh oh!

github-actions Bot commented Sep 11, 2026

Uh oh!

github-actions Bot commented Sep 11, 2026 •

edited

Loading

Uh oh!

github-actions Bot commented Sep 14, 2026 •

edited

Loading

Uh oh!

CYFS3 commented Sep 22, 2026

Uh oh!

Tim-Wang38 commented Sep 22, 2026

Uh oh!

CYFS3 left a comment

Uh oh!

CYFS3 Sep 22, 2026

Uh oh!

CYFS3 Sep 22, 2026

Uh oh!

Tim-Wang38 Sep 23, 2026

Uh oh!

CYFS3 Sep 23, 2026

Uh oh!

Tim-Wang38 Sep 23, 2026

Uh oh!

CYFS3 commented Sep 22, 2026

Uh oh!

This branch has not been deployed

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

	u32_t sio_write(sio_fd_t fd, u8_t *buf, u32_t size)
	{
	RT_ASSERT(fd != RT_NULL);
	return rt_device_write((rt_device_t)fd, 0, buf, size);
	}

Conversation

Tim-Wang38 commented Sep 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

拉取/合并请求描述：(PR description) Fixed #11588

为什么提交这份PR (why to submit this PR)

请提供验证的bsp和config (provide the config and bsp)

当前拉取/合并请求的状态 Intent for your PR

代码质量 Code Quality：

Uh oh!

CLAassistant commented Sep 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Sep 11, 2026

🛠 操作步骤 | Steps

Uh oh!

github-actions Bot commented Sep 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

📌 Code Review Assignment

🏷️ Tag: components

📊 Current Review Status (Last Updated: 2026-09-23 15:57 CST)

📝 Review Instructions

Uh oh!

github-actions Bot commented Sep 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

MemBrowse Memory Report

stm32f407-rt-spark

Uh oh!

CYFS3 commented Sep 22, 2026

Uh oh!

Tim-Wang38 commented Sep 22, 2026

Uh oh!

CYFS3 left a comment

Choose a reason for hiding this comment

Uh oh!

CYFS3 Sep 22, 2026

Choose a reason for hiding this comment

Uh oh!

CYFS3 Sep 22, 2026

Choose a reason for hiding this comment

Uh oh!

Tim-Wang38 Sep 23, 2026

Choose a reason for hiding this comment

Uh oh!

CYFS3 Sep 23, 2026

Choose a reason for hiding this comment

Uh oh!

Tim-Wang38 Sep 23, 2026

Choose a reason for hiding this comment

Uh oh!

CYFS3 commented Sep 22, 2026

Uh oh!

This branch has not been deployed

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Tim-Wang38 commented Sep 11, 2026 •

edited

Loading

CLAassistant commented Sep 11, 2026 •

edited

Loading

github-actions Bot commented Sep 11, 2026 •

edited

Loading

github-actions Bot commented Sep 14, 2026 •

edited

Loading