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

uspace/srv/net/ethip/pdu.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -60 +60 @@
 
         hdr = (eth_header_t *)data;
-        addr48(frame->src, hdr->src);
-        addr48(frame->dest, hdr->dest);
+        eth_addr_encode(&frame->src, hdr->src);
+        eth_addr_encode(&frame->dest, hdr->dest);
         hdr->etype_len = host2uint16_t_be(frame->etype_len);
 
@@ -93 +93 @@
                 return ENOMEM;
 
-        addr48(hdr->src, frame->src);
-        addr48(hdr->dest, frame->dest);
+        eth_addr_decode(hdr->src, &frame->src);
+        eth_addr_decode(hdr->dest, &frame->dest);
         frame->etype_len = uint16_t_be2host(hdr->etype_len);
 
@@ -140 +140 @@
         pfmt->proto_addr_size = IPV4_ADDR_SIZE;
         pfmt->opcode = host2uint16_t_be(fopcode);
-        addr48(packet->sender_hw_addr, pfmt->sender_hw_addr);
+        eth_addr_encode(&packet->sender_hw_addr, pfmt->sender_hw_addr);
         pfmt->sender_proto_addr =
             host2uint32_t_be(packet->sender_proto_addr);
-        addr48(packet->target_hw_addr, pfmt->target_hw_addr);
+        eth_addr_encode(&packet->target_hw_addr, pfmt->target_hw_addr);
         pfmt->target_proto_addr =
             host2uint32_t_be(packet->target_proto_addr);
@@ -203 +203 @@
         }
 
-        addr48(pfmt->sender_hw_addr, packet->sender_hw_addr);
+        eth_addr_decode(pfmt->sender_hw_addr, &packet->sender_hw_addr);
         packet->sender_proto_addr =
             uint32_t_be2host(pfmt->sender_proto_addr);
-        addr48(pfmt->target_hw_addr, packet->target_hw_addr);
+        eth_addr_decode(pfmt->target_hw_addr, &packet->target_hw_addr);
         packet->target_proto_addr =
             uint32_t_be2host(pfmt->target_proto_addr);