From ec9263b4f15c4cf82eb6a211c67baa6385065b8e Mon Sep 17 00:00:00 2001 From: Sean Edmond Date: Mon, 29 Apr 2024 11:51:16 -0700 Subject: [PATCH] Fix neighbor discovery ethernet address saving When a successful neighbor advertisement is received, the ethernet address should be saved for later use to avoid having to redo the neighbor discovery process. For example, with TFTP the address should get saved into "net_server_ethaddr". This is being done correctly with ARP for IPv4, but not for neighbor discovery with IPv6. Signed-off-by: Sean Edmond Reviewed-by: Viacheslav Mitrofanov --- net/ndisc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/ndisc.c b/net/ndisc.c index d417c5987ac..641cf6d8385 100644 --- a/net/ndisc.c +++ b/net/ndisc.c @@ -460,8 +460,8 @@ int ndisc_receive(struct ethernet_hdr *et, struct ip6_hdr *ip6, int len) ndisc_extract_enetaddr(ndisc, neigh_eth_addr); /* save address for later use */ - if (!net_nd_packet_mac) - net_nd_packet_mac = neigh_eth_addr; + if (net_nd_packet_mac) + memcpy(net_nd_packet_mac, neigh_eth_addr, 6); /* modify header, and transmit it */ memcpy(((struct ethernet_hdr *)net_nd_tx_packet)->et_dest,