Changeset 8a9a41e in mainline for uspace/lib/inet/src/iplink.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/lib/inet/src/iplink.c (modified) (10 diffs)

uspace/lib/inet/src/iplink.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libinet
  * @{
  */
@@ -38 +38 @@
 #include <assert.h>
 #include <errno.h>
+#include <inet/addr.h>
+#include <inet/eth_addr.h>
 #include <inet/iplink.h>
-#include <inet/addr.h>
 #include <ipc/iplink.h>
 #include <ipc/services.h>
@@ -115 +116 @@
         aid_t req = async_send_0(exch, IPLINK_SEND6, &answer);
 
-        errno_t rc = async_data_write_start(exch, &sdu->dest, sizeof(addr48_t));
+        errno_t rc = async_data_write_start(exch, &sdu->dest, sizeof(eth_addr_t));
         if (rc != EOK) {
                 async_exchange_end(exch);
@@ -153 +154 @@
 }
 
-errno_t iplink_get_mac48(iplink_t *iplink, addr48_t *mac)
+errno_t iplink_get_mac48(iplink_t *iplink, eth_addr_t *mac)
 {
         async_exch_t *exch = async_exchange_begin(iplink->sess);
@@ -160 +161 @@
         aid_t req = async_send_0(exch, IPLINK_GET_MAC48, &answer);
 
-        errno_t rc = async_data_read_start(exch, mac, sizeof(addr48_t));
+        errno_t rc = async_data_read_start(exch, mac, sizeof(eth_addr_t));
 
         loc_exchange_end(exch);
@@ -175 +176 @@
 }
 
-errno_t iplink_set_mac48(iplink_t *iplink, addr48_t mac)
+errno_t iplink_set_mac48(iplink_t *iplink, eth_addr_t *mac)
 {
         async_exch_t *exch = async_exchange_begin(iplink->sess);
@@ -182 +183 @@
         aid_t req = async_send_0(exch, IPLINK_GET_MAC48, &answer);
 
-        errno_t rc = async_data_read_start(exch, mac, sizeof(addr48_t));
+        errno_t rc = async_data_read_start(exch, mac, sizeof(eth_addr_t));
 
         loc_exchange_end(exch);
@@ -264 +265 @@
 static void iplink_ev_change_addr(iplink_t *iplink, ipc_call_t *icall)
 {
-        addr48_t *addr;
+        eth_addr_t *addr;
         size_t size;
 
         errno_t rc = async_data_write_accept((void **) &addr, false,
-            sizeof(addr48_t), sizeof(addr48_t), 0, &size);
+            sizeof(eth_addr_t), sizeof(eth_addr_t), 0, &size);
         if (rc != EOK) {
                 async_answer_0(icall, rc);
@@ -274 +275 @@
         }
 
-        rc = iplink->ev_ops->change_addr(iplink, *addr);
+        rc = iplink->ev_ops->change_addr(iplink, addr);
         free(addr);
         async_answer_0(icall, EOK);