Changeset 8a9a41e in mainline for uspace/lib/inet/src/inetcfg.c

Timestamp:

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

Author:

GitHub <noreply@…>

Children:

08d81ae

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

uspace/lib/inet/src/inetcfg.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -30 +30 @@
 #include <assert.h>
 #include <errno.h>
+#include <inet/eth_addr.h>
 #include <inet/inetcfg.h>
 #include <ipc/inet.h>
@@ -292 +293 @@
         aid_t req = async_send_1(exch, INETCFG_LINK_GET, link_id, &answer);
         aid_t dreq = async_data_read(exch, name_buf, LOC_NAME_MAXLEN, &dreply);
-        errno_t rc = async_data_read_start(exch, &linfo->mac_addr, sizeof(addr48_t));
+        errno_t rc = async_data_read_start(exch, &linfo->mac_addr, sizeof(eth_addr_t));
         async_wait_for(dreq, &dretval);