Changeset 98abd40 in mainline for uspace/srv/net/ethip/ethip.h

Timestamp:

2013-07-06T21:57:22Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c8bb1633, cdc8a391

Parents:

b8e72fd1 (diff), 507c6f3 (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) (5 diffs)

uspace/srv/net/ethip/ethip.h

@@ -41 +41 @@
 #include <async.h>
 #include <inet/iplink_srv.h>
+#include <inet/addr.h>
 #include <loc.h>
 #include <sys/types.h>
 
-#define MAC48_BROADCAST 0xffffffffffff
-
 typedef struct {
         link_t addr_list;
-        iplink_srv_addr_t addr;
+        inet_addr_t addr;
 } ethip_link_addr_t;
-
-/** IEEE MAC-48 identifier */
-typedef struct {
-        /** MAC Address (in lowest 48 bits) */
-        uint64_t addr;
-} mac48_addr_t;
 
 typedef struct ethip_nic {
@@ -67 +60 @@
 
         /** MAC address */
-        mac48_addr_t mac_addr;
+        addr48_t mac_addr;
         /** List of IP addresses configured on this link */
         list_t addr_list; /* of ethip_link_addr_t */
@@ -75 +68 @@
 typedef struct {
         /** Destination Address */
-        mac48_addr_t dest;
+        addr48_t dest;
         /** Source Address */
-        mac48_addr_t src;
+        addr48_t src;
         /** Ethertype or Length */
         uint16_t etype_len;
@@ -102 +95 @@
         arp_opcode_t opcode;
         /** Sender hardware address */
-        mac48_addr_t sender_hw_addr;
+        addr48_t sender_hw_addr;
         /** Sender protocol address */
-        iplink_srv_addr_t sender_proto_addr;
+        addr32_t sender_proto_addr;
         /** Target hardware address */
-        mac48_addr_t target_hw_addr;
+        addr48_t target_hw_addr;
         /** Target protocol address */
-        iplink_srv_addr_t target_proto_addr;
+        addr32_t target_proto_addr;
 } arp_eth_packet_t;
 
@@ -114 +107 @@
 typedef struct {
         link_t atrans_list;
-        iplink_srv_addr_t ip_addr;
-        mac48_addr_t mac_addr;
+        addr32_t ip_addr;
+        addr48_t mac_addr;
 } ethip_atrans_t;