Changeset 89ac5513 in mainline for uspace/srv/net/ethip/ethip.h

Timestamp:

2013-06-23T19:54:53Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ddb1922

Parents:

3abf0760 (diff), 96cbd18 (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) (3 diffs)

uspace/srv/net/ethip/ethip.h

@@ -48 +48 @@
 typedef struct {
         link_t addr_list;
-        iplink_srv_addr_t addr;
+        uint32_t addr;
 } ethip_link_addr_t;
 
@@ -104 +104 @@
         mac48_addr_t sender_hw_addr;
         /** Sender protocol address */
-        iplink_srv_addr_t sender_proto_addr;
+        uint32_t sender_proto_addr;
         /** Target hardware address */
         mac48_addr_t target_hw_addr;
         /** Target protocol address */
-        iplink_srv_addr_t target_proto_addr;
+        uint32_t target_proto_addr;
 } arp_eth_packet_t;
 
@@ -114 +114 @@
 typedef struct {
         link_t atrans_list;
-        iplink_srv_addr_t ip_addr;
+        uint32_t ip_addr;
         mac48_addr_t mac_addr;
 } ethip_atrans_t;