Changeset d7ff048 in mainline for uspace/srv/net/il/arp/arp.h

Timestamp:

2011-10-08T13:08:53Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

bf08ff0

Parents:

8367d1d (diff), 80099c19 (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.

Message:

Merge mainline changes

File:

• uspace/srv/net/il/arp/arp.h (modified) (1 diff)

uspace/srv/net/il/arp/arp.h

@@ -92 +92 @@
 struct arp_device {
         /** Actual device hardware address. */
-        measured_string_t *addr;
-        /** Actual device hardware address data. */
-        uint8_t *addr_data;
+        uint8_t addr[NIC_MAX_ADDRESS_LENGTH];
+        /** Actual device hardware address length. */
+        size_t addr_len;
         /** Broadcast device hardware address. */
-        measured_string_t *broadcast_addr;
-        /** Broadcast device hardware address data. */
-        uint8_t *broadcast_data;
+        uint8_t broadcast_addr[NIC_MAX_ADDRESS_LENGTH];
+        /** Broadcast device hardware address length. */
+        size_t broadcast_addr_len;
         /** Device identifier. */
-        device_id_t device_id;
+        nic_device_id_t device_id;
         /** Hardware type. */
         hw_type_t hardware;