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

Timestamp:

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

Author:

GitHub <noreply@…>

Children:

baa3834

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/ntrans.c (modified) (6 diffs)

uspace/srv/net/inetsrv/ntrans.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2021 Jiri Svoboda
  * Copyright (c) 2013 Antonin Steinhauser
  * All rights reserved.
@@ -38 +39 @@
 #include <errno.h>
 #include <fibril_synch.h>
+#include <inet/eth_addr.h>
 #include <inet/iplink_srv.h>
 #include <stdlib.h>
@@ -73 +75 @@
  *
  */
-errno_t ntrans_add(addr128_t ip_addr, addr48_t mac_addr)
+errno_t ntrans_add(addr128_t ip_addr, eth_addr_t *mac_addr)
 {
         inet_ntrans_t *ntrans;
@@ -83 +85 @@
 
         addr128(ip_addr, ntrans->ip_addr);
-        addr48(mac_addr, ntrans->mac_addr);
+        ntrans->mac_addr = *mac_addr;
 
         fibril_mutex_lock(&ntrans_list_lock);
@@ -134 +136 @@
  *
  */
-errno_t ntrans_lookup(addr128_t ip_addr, addr48_t mac_addr)
+errno_t ntrans_lookup(addr128_t ip_addr, eth_addr_t *mac_addr)
 {
         fibril_mutex_lock(&ntrans_list_lock);
@@ -144 +146 @@
 
         fibril_mutex_unlock(&ntrans_list_lock);
-        addr48(ntrans->mac_addr, mac_addr);
+        *mac_addr = ntrans->mac_addr;
         return EOK;
 }