Changeset 8a9a41e in mainline for uspace/srv/net/inetsrv/inetsrv.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/srv/net/inetsrv/inetsrv.h (modified) (3 diffs)

uspace/srv/net/inetsrv/inetsrv.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -41 +41 @@
 #include <stdbool.h>
 #include <inet/addr.h>
+#include <inet/eth_addr.h>
 #include <inet/iplink.h>
 #include <ipc/loc.h>
@@ -109 +110 @@
         iplink_t *iplink;
         size_t def_mtu;
-        addr48_t mac;
+        eth_addr_t mac;
         bool mac_valid;
 } inet_link_t;