diff options
| author | Tom Rini <trini@konsulko.com> | 2021-11-23 07:43:50 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-11-23 07:43:50 -0500 |
| commit | 5a24e12f13e7af70fbb7687da09f377ecbe17b84 (patch) | |
| tree | 6aeb94ed47e252474b0917a13505e1c533434629 /net/bootp.c | |
| parent | f9bab982ae9e459b4e64c8a4ca8569aac32bb3bf (diff) | |
| parent | f11513d9978719820998ac05ed5a5da32465f926 (diff) | |
Merge branch 'next' of https://source.denx.de/u-boot/custodians/u-boot-net into next
- Various DSA additions
- bootp: fix for VCI string
- tsec: support for promiscuous mode
- add Aspeed MDIO driver
Diffstat (limited to 'net/bootp.c')
| -rw-r--r-- | net/bootp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bootp.c b/net/bootp.c index 655b9cceb66..58e30cd6b0c 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 */ |