Changeset 7a68fe5 in mainline for uspace/srv/net/il/ip/ip.h

Timestamp:

2011-10-10T06:58:55Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

2ea6392

Parents:

e68c834 (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 with mainline

File:

• uspace/srv/net/il/ip/ip.h (modified) (2 diffs)

uspace/srv/net/il/ip/ip.h

@@ -92 +92 @@
         in_addr_t broadcast;
         /** Device identifier. */
-        device_id_t device_id;
+        nic_device_id_t device_id;
         /** Indicates whether using DHCP. */
         int dhcp;
@@ -108 +108 @@
         services_t service;
         /** Device state. */
-        device_state_t state;
+        nic_device_state_t state;
 };