Changeset f05edcb in mainline for uspace/srv/net/ethip/ethip_nic.c

Timestamp:

2021-08-08T08:28:24Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d5ed54b

Parents:

98a935e

Message:

Make addr48_t a structure

File:

• uspace/srv/net/ethip/ethip_nic.c (modified) (5 diffs)

uspace/srv/net/ethip/ethip_nic.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -193 +193 @@
         }
 
-        addr48(nic_address.address, nic->mac_addr);
+        mac48_decode(nic_address.address, &nic->mac_addr);
 
         rc = nic_set_state(nic->sess, NIC_STATE_ACTIVE);
@@ -400 +400 @@
 
                 addr48_t mac;
-                addr48_solicited_node(v6, mac);
+                addr48_solicited_node(v6, &mac);
 
                 /* Avoid duplicate addresses in the list */
@@ -407 +407 @@
 
                 for (size_t j = 0; j < i; j++) {
-                        if (addr48_compare(mac_list[j].address, mac)) {
+                        addr48_t mac_entry;
+                        mac48_decode(mac_list[j].address, &mac_entry);
+                        if (addr48_compare(&mac_entry, &mac)) {
                                 found = true;
                                 break;
@@ -414 +416 @@
 
                 if (!found) {
-                        addr48(mac, mac_list[i].address);
+                        mac48_encode(&mac, mac_list[i].address);
                         i++;
-                } else
+                } else {
                         count--;
+                }
         }