Changeset 8a9a41e in mainline for uspace/srv/net/ethip/atrans.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/ethip/atrans.c (modified) (7 diffs)

uspace/srv/net/ethip/atrans.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 <inet/iplink_srv.h>
 #include <stdlib.h>
@@ -59 +60 @@
 }
 
-errno_t atrans_add(addr32_t ip_addr, addr48_t mac_addr)
+errno_t atrans_add(addr32_t ip_addr, eth_addr_t *mac_addr)
 {
         ethip_atrans_t *atrans;
@@ -69 +70 @@
 
         atrans->ip_addr = ip_addr;
-        addr48(mac_addr, atrans->mac_addr);
+        atrans->mac_addr = *mac_addr;
 
         fibril_mutex_lock(&atrans_list_lock);
@@ -103 +104 @@
 }
 
-static errno_t atrans_lookup_locked(addr32_t ip_addr, addr48_t mac_addr)
+static errno_t atrans_lookup_locked(addr32_t ip_addr, eth_addr_t *mac_addr)
 {
         ethip_atrans_t *atrans = atrans_find(ip_addr);
@@ -109 +110 @@
                 return ENOENT;
 
-        addr48(atrans->mac_addr, mac_addr);
+        *mac_addr = atrans->mac_addr;
         return EOK;
 }
 
-errno_t atrans_lookup(addr32_t ip_addr, addr48_t mac_addr)
+errno_t atrans_lookup(addr32_t ip_addr, eth_addr_t *mac_addr)
 {
         errno_t rc;
@@ -135 +136 @@
 
 errno_t atrans_lookup_timeout(addr32_t ip_addr, usec_t timeout,
-    addr48_t mac_addr)
+    eth_addr_t *mac_addr)
 {
         fibril_timer_t *t;