Changeset 03c971f in mainline for uspace/srv/net/ethip/ethip.h

Timestamp:

2013-08-15T14:20:16Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

bb2a5b2

Parents:

f2c19b0 (diff), 2921602 (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:

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;
+        link_t link;
+        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 {
-        link_t nic_list;
+        link_t link;
         service_id_t svc_id;
         char *svc_name;
@@ -67 +60 @@
 
         /** MAC address */
-        mac48_addr_t mac_addr;
-        /** List of IP addresses configured on this link */
-        list_t addr_list; /* of ethip_link_addr_t */
+        addr48_t mac_addr;
+        
+        /**
+         * List of IP addresses configured on this link
+         * (of the type ethip_link_addr_t)
+         */
+        list_t addr_list;
 } ethip_nic_t;
 
@@ -75 +72 @@
 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 +99 @@
         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 +111 @@
 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;