Sarthak-Pandey commented on PR #20627:
URL: https://github.com/apache/nuttx/pull/20627#issuecomment-6367428938
Hi @acassis ,
I have resolved the merge conflicts with the latest `master`:
1. **`net/tcp/tcp_recvfrom.c`**:
- Retained the `ret` assignment avoiding duplicate variable declaration
at the block level.
2. **`net/tcp/tcp_send.c`**:
- Integrated the urgent pointer (`urgp`) handling logic inside the newly
refactored `tcp_fill_header()` function, ensuring compatibility with both
standard TCP transmission and 6LoWPAN.
3. **Code Style**:
- Verified with `nxstyle` to ensure full compliance with NuttX coding
standards.
Please review the latest update. Thanks!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
