Changeset dd0c8a0 in mainline for uspace/srv/net/ethip/std.h

Timestamp:

2013-09-29T06:56:33Z (12 years ago)

Author:

Beniamino Galvani <b.galvani@…>

Branches:

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

Children:

a9bd960d

Parents:

3deb0155 (diff), 13be2583 (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/std.h (modified) (3 diffs)

uspace/srv/net/ethip/std.h

@@ -39 +39 @@
 
 #include <sys/types.h>
+#include <inet/addr.h>
 
-#define ETH_ADDR_SIZE 6
-#define IPV4_ADDR_SIZE 4
-#define ETH_FRAME_MIN_SIZE 60
+#define ETH_ADDR_SIZE       6
+#define IPV4_ADDR_SIZE      4
+#define ETH_FRAME_MIN_SIZE  60
 
 /** Ethernet frame header */
 typedef struct {
         /** Destination Address */
-        uint8_t dest[ETH_ADDR_SIZE];
+        addr48_t dest;
         /** Source Address */
-        uint8_t src[ETH_ADDR_SIZE];
+        addr48_t src;
         /** Ethertype or Length */
         uint16_t etype_len;
@@ -67 +68 @@
         uint16_t opcode;
         /** Sender hardware address */
-        uint8_t sender_hw_addr[ETH_ADDR_SIZE];
+        addr48_t sender_hw_addr;
         /** Sender protocol address */
-        uint32_t sender_proto_addr;
+        addr32_t sender_proto_addr;
         /** Target hardware address */
-        uint8_t target_hw_addr[ETH_ADDR_SIZE];
+        addr48_t target_hw_addr;
         /** Target protocol address */
-        uint32_t target_proto_addr;
+        addr32_t target_proto_addr;
 } __attribute__((packed)) arp_eth_packet_fmt_t;
 
@@ -87 +88 @@
 /** IP Ethertype */
 enum ether_type {
-        ETYPE_ARP = 0x0806,
-        ETYPE_IP  = 0x0800
+        ETYPE_ARP  = 0x0806,
+        ETYPE_IP   = 0x0800,
+        ETYPE_IPV6 = 0x86DD
 };
-
 
 #endif