Changeset 8a9a41e in mainline for uspace/srv/net/dhcp/dhcp.c

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/dhcp/dhcp.c (modified) (4 diffs)

uspace/srv/net/dhcp/dhcp.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2013 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -42 +42 @@
 #include <fibril_synch.h>
 #include <inet/addr.h>
+#include <inet/eth_addr.h>
 #include <inet/dnsr.h>
 #include <inet/inetcfg.h>
@@ -157 +158 @@
         hdr->op = op_bootrequest;
         hdr->htype = 1; /* AHRD_ETHERNET */
-        hdr->hlen = sizeof(addr48_t);
+        hdr->hlen = ETH_ADDR_SIZE;
         hdr->xid = host2uint32_t_be(42);
         hdr->flags = flag_broadcast;
 
-        addr48(dlink->link_info.mac_addr, hdr->chaddr);
+        eth_addr_encode(&dlink->link_info.mac_addr, hdr->chaddr);
         hdr->opt_magic = host2uint32_t_be(dhcp_opt_magic);
 
@@ -185 +186 @@
         hdr->flags = flag_broadcast;
         hdr->ciaddr = host2uint32_t_be(offer->oaddr.addr);
-        addr48(dlink->link_info.mac_addr, hdr->chaddr);
+        eth_addr_encode(&dlink->link_info.mac_addr, hdr->chaddr);
         hdr->opt_magic = host2uint32_t_be(dhcp_opt_magic);