Changeset 8a9a41e in mainline for uspace/srv/net/inetsrv/pdu.c

Timestamp:

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

Author:

GitHub <noreply@…>

Children:

f628215

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/pdu.c (modified) (4 diffs)

uspace/srv/net/inetsrv/pdu.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -40 +40 @@
 #include <errno.h>
 #include <fibril_synch.h>
+#include <inet/eth_addr.h>
 #include <io/log.h>
 #include <macros.h>
@@ -504 +505 @@
 
         message->length = 1;
-        addr48(ndp->sender_hw_addr, message->mac);
+        eth_addr_encode(&ndp->sender_hw_addr, message->mac);
 
         icmpv6_phdr_t phdr;
@@ -552 +553 @@
 
         addr128_t_be2host(message->target_address, ndp->target_proto_addr);
-        addr48(message->mac, ndp->sender_hw_addr);
+        eth_addr_decode(message->mac, &ndp->sender_hw_addr);
 
         return EOK;