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

Timestamp:

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

Author:

GitHub <noreply@…>

Children:

9ea3a41

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

uspace/srv/net/ethip/ethip.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -39 +39 @@
 #include <async.h>
 #include <errno.h>
+#include <inet/eth_addr.h>
 #include <inet/iplink_srv.h>
 #include <io/log.h>
@@ -58 +59 @@
 static errno_t ethip_send6(iplink_srv_t *srv, iplink_sdu6_t *sdu);
 static errno_t ethip_get_mtu(iplink_srv_t *srv, size_t *mtu);
-static errno_t ethip_get_mac48(iplink_srv_t *srv, addr48_t *mac);
-static errno_t ethip_set_mac48(iplink_srv_t *srv, addr48_t *mac);
+static errno_t ethip_get_mac48(iplink_srv_t *srv, eth_addr_t *mac);
+static errno_t ethip_set_mac48(iplink_srv_t *srv, eth_addr_t *mac);
 static errno_t ethip_addr_add(iplink_srv_t *srv, inet_addr_t *addr);
 static errno_t ethip_addr_remove(iplink_srv_t *srv, inet_addr_t *addr);
@@ -177 +178 @@
         eth_frame_t frame;
 
-        errno_t rc = arp_translate(nic, sdu->src, sdu->dest, frame.dest);
+        errno_t rc = arp_translate(nic, sdu->src, sdu->dest, &frame.dest);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_WARN, "Failed to look up IPv4 address 0x%"
@@ -184 +185 @@
         }
 
-        addr48(nic->mac_addr, frame.src);
+        frame.src = nic->mac_addr;
         frame.etype_len = ETYPE_IP;
         frame.data = sdu->data;
@@ -208 +209 @@
         eth_frame_t frame;
 
-        addr48(sdu->dest, frame.dest);
-        addr48(nic->mac_addr, frame.src);
+        frame.dest = sdu->dest;
+        frame.src = nic->mac_addr;
         frame.etype_len = ETYPE_IPV6;
         frame.data = sdu->data;
@@ -276 +277 @@
 }
 
-static errno_t ethip_get_mac48(iplink_srv_t *srv, addr48_t *mac)
+static errno_t ethip_get_mac48(iplink_srv_t *srv, eth_addr_t *mac)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_get_mac48()");
 
         ethip_nic_t *nic = (ethip_nic_t *) srv->arg;
-        addr48(nic->mac_addr, *mac);
-
-        return EOK;
-}
-
-static errno_t ethip_set_mac48(iplink_srv_t *srv, addr48_t *mac)
+        *mac = nic->mac_addr;
+
+        return EOK;
+}
+
+static errno_t ethip_set_mac48(iplink_srv_t *srv, eth_addr_t *mac)
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_set_mac48()");
 
         ethip_nic_t *nic = (ethip_nic_t *) srv->arg;
-        addr48(*mac, nic->mac_addr);
+        nic->mac_addr = *mac;
 
         return EOK;