Changeset 8a9a41e in mainline for uspace/srv/net/inetsrv/ndp.h

Timestamp:

2021-10-24T08:28:43Z (3 years ago)

Author:

GitHub <noreply@…>

Children:

1eeddb3

Parents:

2ce943a (diff), cd981f2a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Erik Kučák <35500848+Riko196@…> (2021-10-24 08:28:43)

git-committer:

GitHub <noreply@…> (2021-10-24 08:28:43)

Message:

Merge branch 'HelenOS:master' into master

File:

• uspace/srv/net/inetsrv/ndp.h (modified) (4 diffs)

uspace/srv/net/inetsrv/ndp.h

@@ -1 +1 @@
 /*
+ * Copyright (c) 2021 Jiri Svoboda
  * Copyright (c) 2013 Antonin Steinhauser
  * All rights reserved.
@@ -39 +40 @@
 
 #include <inet/addr.h>
+#include <inet/eth_addr.h>
 #include "inetsrv.h"
 #include "icmpv6_std.h"
@@ -52 +54 @@
         ndp_opcode_t opcode;
         /** Sender hardware address */
-        addr48_t sender_hw_addr;
+        eth_addr_t sender_hw_addr;
         /** Sender protocol address */
         addr128_t sender_proto_addr;
         /** Target hardware address */
-        addr48_t target_hw_addr;
+        eth_addr_t target_hw_addr;
         /** Target protocol address */
         addr128_t target_proto_addr;
@@ -64 +66 @@
 
 extern errno_t ndp_received(inet_dgram_t *);
-extern errno_t ndp_translate(addr128_t, addr128_t, addr48_t, inet_link_t *);
+extern errno_t ndp_translate(addr128_t, addr128_t, eth_addr_t *, inet_link_t *);
 
 #endif