Changes in uspace/srv/net/inetsrv/ndp.c [1d94e21:5a324d99] in mainline

File:

• uspace/srv/net/inetsrv/ndp.c (modified) (3 diffs)

uspace/srv/net/inetsrv/ndp.c

@@ -39 +39 @@
 #include <malloc.h>
 #include <io/log.h>
-#include <net/socket_codes.h>
 #include "ntrans.h"
 #include "addrobj.h"
@@ -49 +48 @@
 #define NDP_REQUEST_TIMEOUT  (3 * 1000 * 1000)
 
-static addr48_t solicited_node_mac =
-    {0x33, 0x33, 0xff, 0, 0, 0};
-
 static addr128_t solicited_node_ip =
     {0xff, 0x02, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x01, 0xff, 0, 0, 0};
-
-/** Compute solicited node MAC multicast address from target IPv6 address
- *
- * @param ip_addr  Target IPv6 address
- * @param mac_addr Solicited MAC address to be assigned
- *
- */
-static void ndp_solicited_node_mac(addr128_t ip_addr, addr48_t mac_addr)
-{
-        memcpy(mac_addr, solicited_node_mac, 3);
-        memcpy(mac_addr + 3, ip_addr + 13, 3);
-}
 
 /** Compute solicited node IPv6 multicast address from target IPv6 address
@@ -186 +170 @@
         addr128(src_addr, packet.sender_proto_addr);
         addr128(ip_addr, packet.solicited_ip);
-        ndp_solicited_node_mac(ip_addr, packet.target_hw_addr);
+        addr48_solicited_node(ip_addr, packet.target_hw_addr);
         ndp_solicited_node_ip(ip_addr, packet.target_proto_addr);