aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2022-12-23 07:44:30 -0500
committerTom Rini <trini@konsulko.com>2022-12-23 07:44:30 -0500
commit24a0a00f07fcbf4f8ca64cb13b2fa7d624ca6af9 (patch)
tree287ff08214bd70bcd070a2bd904800675ced8167 /net
parent1154e965d0bd16cf438afdaa4118e1455fd71a44 (diff)
parent440098c42e7369f4b5703a82723b2ce268180a1f (diff)
Merge branch '2022-12-22-assorted-important-fixes'
- Split up the aarch64 Azure CI job more, to avoid time limits, nuvoton network fix, SPL_OPTEE_IMAGE dependency fix, some fixes to the IPv6 code, PowerPC build flag fixes, silence pylibfdt version warning.
Diffstat (limited to 'net')
-rw-r--r--net/ndisc.c2
-rw-r--r--net/net.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/net/ndisc.c b/net/ndisc.c
index 3c0eeeaea3..367dae7676 100644
--- a/net/ndisc.c
+++ b/net/ndisc.c
@@ -265,7 +265,7 @@ int ndisc_receive(struct ethernet_hdr *et, struct ip6_hdr *ip6, int len)
/* save address for later use */
if (!net_nd_packet_mac)
- memcpy(net_nd_packet_mac, neigh_eth_addr, 7);
+ net_nd_packet_mac = neigh_eth_addr;
/* modify header, and transmit it */
memcpy(((struct ethernet_hdr *)net_nd_tx_packet)->et_dest,
diff --git a/net/net.c b/net/net.c
index 1c39acc493..57da9bda85 100644
--- a/net/net.c
+++ b/net/net.c
@@ -1269,6 +1269,7 @@ void net_process_received_packet(uchar *in_packet, int len)
#if IS_ENABLED(CONFIG_IPV6)
case PROT_IP6:
net_ip6_handler(et, (struct ip6_hdr *)ip, len);
+ break;
#endif
case PROT_IP:
debug_cond(DEBUG_NET_PKT, "Got IP\n");