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

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/include/inet/iplink_srv.h (modified) (5 diffs)

uspace/lib/inet/include/inet/iplink_srv.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_SRV_H_
-#define _LIBC_INET_IPLINK_SRV_H_
+#ifndef LIBINET_INET_IPLINK_SRV_H
+#define LIBINET_INET_IPLINK_SRV_H
 
 #include <async.h>
 #include <fibril_synch.h>
+#include <inet/addr.h>
+#include <inet/eth_addr.h>
+#include <inet/iplink.h>
 #include <stdbool.h>
-#include <inet/addr.h>
-#include <inet/iplink.h>
 
 struct iplink_ops;
@@ -58 +59 @@
         errno_t (*send6)(iplink_srv_t *, iplink_sdu6_t *);
         errno_t (*get_mtu)(iplink_srv_t *, size_t *);
-        errno_t (*get_mac48)(iplink_srv_t *, addr48_t *);
-        errno_t (*set_mac48)(iplink_srv_t *, addr48_t *);
+        errno_t (*get_mac48)(iplink_srv_t *, eth_addr_t *);
+        errno_t (*set_mac48)(iplink_srv_t *, eth_addr_t *);
         errno_t (*addr_add)(iplink_srv_t *, inet_addr_t *);
         errno_t (*addr_remove)(iplink_srv_t *, inet_addr_t *);
@@ -68 +69 @@
 extern errno_t iplink_conn(ipc_call_t *, void *);
 extern errno_t iplink_ev_recv(iplink_srv_t *, iplink_recv_sdu_t *, ip_ver_t);
-extern errno_t iplink_ev_change_addr(iplink_srv_t *, addr48_t *);
+extern errno_t iplink_ev_change_addr(iplink_srv_t *, eth_addr_t *);
 
 #endif