smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'v2023.07-rc6' into next

Browse Source 
Prepare v2023.07-rc6
This commit is contained in:
Tom Rini
2023-07-05 11:28:55 -04:00
parent 45f77b807c e1bebc16e1
commit e80f4079b3
124 changed files with 5042 additions and 4066 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
net/dhcpv6.c
View File

@@ -316,6 +316,11 @@ static void dhcp6_parse_options(uchar *rx_pkt, unsigned int len)
option_ptr = ((uchar *)option_hdr) + sizeof(struct dhcp6_hdr);
option_len = ntohs(option_hdr->option_len);
if (option_ptr + option_len > rx_pkt + len) {
debug("Invalid option length\n");
return;
}
switch (ntohs(option_hdr->option_id)) {
case DHCP6_OPTION_CLIENTID:
if (memcmp(option_ptr, sm_params.duid, option_len)

2
net/dhcpv6.h
View File

@@ -38,7 +38,7 @@
#define DUID_MAX_SIZE DUID_LL_SIZE /* only supports DUID-LL currently */
/* vendor-class-data to send in vendor clas option */
#define DHCP6_VCI_STRING "U-boot"
#define DHCP6_VCI_STRING "U-Boot"
#define DHCP6_MULTICAST_ADDR "ff02::1:2" /* DHCP multicast address */