Changeset 8a9a41e in mainline for uspace/lib/inet/include/inet/iplink.h

Timestamp:

2021-10-24T08:28:43Z (3 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/lib/inet/include/inet/iplink.h (modified) (6 diffs)

uspace/lib/inet/include/inet/iplink.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup libinet
  * @{
  */
@@ -33 +33 @@
  */
 
-#ifndef _LIBC_INET_IPLINK_H_
-#define _LIBC_INET_IPLINK_H_
+#ifndef LIBINET_INET_IPLINK_H
+#define LIBINET_INET_IPLINK_H
 
 #include <async.h>
 #include <inet/addr.h>
+#include <inet/eth_addr.h>
 
 struct iplink_ev_ops;
@@ -62 +63 @@
 typedef struct {
         /** Local MAC destination address */
-        addr48_t dest;
+        eth_addr_t dest;
         /** Serialized IP packet */
         void *data;
@@ -79 +80 @@
 typedef struct iplink_ev_ops {
         errno_t (*recv)(iplink_t *, iplink_recv_sdu_t *, ip_ver_t);
-        errno_t (*change_addr)(iplink_t *, addr48_t);
+        errno_t (*change_addr)(iplink_t *, eth_addr_t *);
 } iplink_ev_ops_t;
 
@@ -89 +90 @@
 extern errno_t iplink_addr_remove(iplink_t *, inet_addr_t *);
 extern errno_t iplink_get_mtu(iplink_t *, size_t *);
-extern errno_t iplink_get_mac48(iplink_t *, addr48_t *);
-extern errno_t iplink_set_mac48(iplink_t *, addr48_t);
+extern errno_t iplink_get_mac48(iplink_t *, eth_addr_t *);
+extern errno_t iplink_set_mac48(iplink_t *, eth_addr_t *);
 extern void *iplink_get_userptr(iplink_t *);