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

Timestamp:

2021-10-24T08:28:43Z (2 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/addrobj.c (modified) (4 diffs)

uspace/srv/net/inetsrv/addrobj.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -38 +38 @@
 #include <errno.h>
 #include <fibril_synch.h>
+#include <inet/eth_addr.h>
 #include <io/log.h>
 #include <ipc/loc.h>
@@ -229 +230 @@
 
         errno_t rc;
-        addr48_t ldest_mac;
+        eth_addr_t ldest_mac;
 
         switch (ldest_ver) {
@@ -239 +240 @@
                  * Translate local destination IPv6 address.
                  */
-                rc = ndp_translate(lsrc_v6, ldest_v6, ldest_mac, addr->ilink);
+                rc = ndp_translate(lsrc_v6, ldest_v6, &ldest_mac, addr->ilink);
                 if (rc != EOK)
                         return rc;
 
-                return inet_link_send_dgram6(addr->ilink, ldest_mac, dgram,
+                return inet_link_send_dgram6(addr->ilink, &ldest_mac, dgram,
                     proto, ttl, df);
         default: