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

uspace/srv/net/inetsrv/inetcfg.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2013 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -177 +177 @@
         linfo->def_mtu = ilink->def_mtu;
         if (ilink->mac_valid) {
-                addr48(ilink->mac, linfo->mac_addr);
+                linfo->mac_addr = ilink->mac;
         } else {
-                memset(linfo->mac_addr, 0, sizeof(linfo->mac_addr));
+                memset(&linfo->mac_addr, 0, sizeof(linfo->mac_addr));
         }