Merge upstream/main into the Spanning Tree branch

Browse Source

cmd_parser.c conflicted twice: main rewrote the pvid command around the
new port-separator and atoi helpers, next to the line where this branch
delegates "stp" to stp_parse(). Both belong, so the STP delegation keeps
main's pvid body.

The linker caught what the merge could not see: main changed atoi_byte()
to return the digit count and leave the value in atoi_results_u8, where
it used to return non-zero on failure and write through a pointer. Note
the sense is inverted, so the three calls in rtl837x_stp.c are adjusted
rather than just re-arranged.

...

This commit is contained in:

d00f committed 2026-08-26 16:29:39 +02:00

2 parents 9a6e2b3e01 45d0aac118

commit 75b223223c

11 files changed

+477 -359

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

cmd_parser.c

+383 -283

File diff suppressed because it is too large. Load diff