Changeset bdae198 in mainline for uspace/srv/net/ethip/ethip.h

Timestamp:

2013-08-04T12:01:10Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

ea509069

Parents:

b08879c2 (diff), d856110 (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/ethip/ethip.h (modified) (2 diffs)

uspace/srv/net/ethip/ethip.h

@@ -46 +46 @@
 
 typedef struct {
-        link_t addr_list;
+        link_t link;
         inet_addr_t addr;
 } ethip_link_addr_t;
 
 typedef struct ethip_nic {
-        link_t nic_list;
+        link_t link;
         service_id_t svc_id;
         char *svc_name;
@@ -61 +61 @@
         /** MAC address */
         addr48_t mac_addr;
-        /** List of IP addresses configured on this link */
-        list_t addr_list; /* of ethip_link_addr_t */
+        
+        /**
+         * List of IP addresses configured on this link
+         * (of the type ethip_link_addr_t)
+         */
+        list_t addr_list;
 } ethip_nic_t;