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

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/pdu.c (modified) (3 diffs)

uspace/srv/net/ethip/pdu.c

@@ -170 +170 @@
         mac48_encode(&packet->sender_hw_addr, pfmt->sender_hw_addr);
         pfmt->sender_proto_addr =
-            host2uint32_t_be(packet->sender_proto_addr.ipv4);
+            host2uint32_t_be(packet->sender_proto_addr);
         mac48_encode(&packet->target_hw_addr, pfmt->target_hw_addr);
         pfmt->target_proto_addr =
-            host2uint32_t_be(packet->target_proto_addr.ipv4);
+            host2uint32_t_be(packet->target_proto_addr);
 
         *rdata = data;
@@ -228 +228 @@
 
         mac48_decode(pfmt->sender_hw_addr, &packet->sender_hw_addr);
-        packet->sender_proto_addr.ipv4 =
+        packet->sender_proto_addr =
             uint32_t_be2host(pfmt->sender_proto_addr);
         mac48_decode(pfmt->target_hw_addr, &packet->target_hw_addr);
-        packet->target_proto_addr.ipv4 =
+        packet->target_proto_addr =
             uint32_t_be2host(pfmt->target_proto_addr);
         log_msg(LOG_DEFAULT, LVL_DEBUG, "packet->tpa = %x\n", pfmt->target_proto_addr);
@@ -238 +238 @@
 }
 
-
 /** @}
  */