| Message ID | 1634036519-70118-1-git-send-email-ntlm-walter.stoll@duagon.com |
|---|---|
| State | Accepted |
| Commit | d4a660aafa12646c64eac2081978fb80cddc0e93 |
| Delegated to: | Ramon Fried |
| Headers | show |
| Series | net: bootp: Correct VCI string transmission | expand |
On Tue, 12 Oct 2021 at 05:50, Walter Stoll <walter.stoll@duagon.com> wrote: > > The VCI string sent during bootp of U-Boot-SPL is corrupt. This is > because the byte counter is not adjusted within the bootp_extended() > function when the VCI string is added. We fix this. > > Signed-off-by: Walter Stoll <walter.stoll@duagon.com> > --- > net/bootp.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/bootp.c b/net/bootp.c > index 655b9cceb6..58e30cd6b0 100644 > --- a/net/bootp.c > +++ b/net/bootp.c > @@ -647,7 +647,7 @@ static int bootp_extended(u8 *e) > *e++ = (576 - 312 + OPT_FIELD_SIZE) & 0xff; > #endif > > - add_vci(e); > + e = add_vci(e); > > #if defined(CONFIG_BOOTP_SUBNETMASK) > *e++ = 1; /* Subnet mask request */ > -- > 2.33.0 > Reviewed-by: Simon Glass <sjg@chromium.org> Gosh that add_vci() could use a clean-up
On Thu, Oct 14, 2021 at 6:13 PM Simon Glass <sjg@chromium.org> wrote: > > On Tue, 12 Oct 2021 at 05:50, Walter Stoll <walter.stoll@duagon.com> wrote: > > > > The VCI string sent during bootp of U-Boot-SPL is corrupt. This is > > because the byte counter is not adjusted within the bootp_extended() > > function when the VCI string is added. We fix this. > > > > Signed-off-by: Walter Stoll <walter.stoll@duagon.com> > > --- > > net/bootp.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/net/bootp.c b/net/bootp.c > > index 655b9cceb6..58e30cd6b0 100644 > > --- a/net/bootp.c > > +++ b/net/bootp.c > > @@ -647,7 +647,7 @@ static int bootp_extended(u8 *e) > > *e++ = (576 - 312 + OPT_FIELD_SIZE) & 0xff; > > #endif > > > > - add_vci(e); > > + e = add_vci(e); > > > > #if defined(CONFIG_BOOTP_SUBNETMASK) > > *e++ = 1; /* Subnet mask request */ > > -- > > 2.33.0 > > > > Reviewed-by: Simon Glass <sjg@chromium.org> > > Gosh that add_vci() could use a clean-up applied to u-boot-net/next Thanks, Ramon.
diff --git a/net/bootp.c b/net/bootp.c index 655b9cceb6..58e30cd6b0 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -647,7 +647,7 @@ static int bootp_extended(u8 *e) *e++ = (576 - 312 + OPT_FIELD_SIZE) & 0xff; #endif - add_vci(e); + e = add_vci(e); #if defined(CONFIG_BOOTP_SUBNETMASK) *e++ = 1; /* Subnet mask request */
The VCI string sent during bootp of U-Boot-SPL is corrupt. This is because the byte counter is not adjusted within the bootp_extended() function when the VCI string is added. We fix this. Signed-off-by: Walter Stoll <walter.stoll@duagon.com> --- net/bootp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)