Changeset d5ed54b in mainline for uspace/srv/net/ethip/arp.c

Timestamp:

2021-08-08T08:31:02Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b4edc96

Parents:

f05edcb

Message:

Use assignment operator to copy Ethernet addresses

File:

• uspace/srv/net/ethip/arp.c (modified) (4 diffs)

uspace/srv/net/ethip/arp.c

@@ -85 +85 @@
 
                 reply.opcode = aop_reply;
-                addr48(&nic->mac_addr, &reply.sender_hw_addr);
+                reply.sender_hw_addr = nic->mac_addr;
                 reply.sender_proto_addr = laddr_v4;
-                addr48(&packet.sender_hw_addr, &reply.target_hw_addr);
+                reply.target_hw_addr = packet.sender_hw_addr;
                 reply.target_proto_addr = packet.sender_proto_addr;
 
@@ -99 +99 @@
         /* Broadcast address */
         if (ip_addr == addr32_broadcast_all_hosts) {
-                addr48(&addr48_broadcast, mac_addr);
+                *mac_addr = addr48_broadcast;
                 return EOK;
         }
@@ -110 +110 @@
 
         packet.opcode = aop_request;
-        addr48(&nic->mac_addr, &packet.sender_hw_addr);
+        packet.sender_hw_addr = nic->mac_addr;
         packet.sender_proto_addr = src_addr;
-        addr48(&addr48_broadcast, &packet.target_hw_addr);
+        packet.target_hw_addr = addr48_broadcast;
         packet.target_proto_addr = ip_addr;
 
@@ -138 +138 @@
                 return rc;
 
-        addr48(&packet->target_hw_addr, &frame.dest);
-        addr48(&packet->sender_hw_addr, &frame.src);
+        frame.dest = packet->target_hw_addr;
+        frame.src = packet->sender_hw_addr;
         frame.etype_len = ETYPE_ARP;
         frame.data = pdata;