Changes in uspace/srv/net/ethip/std.h [d8b47eca:69a93df7] in mainline

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 */
-        addr48_t dest;
+        uint8_t dest[ETH_ADDR_SIZE];
         /** Source Address */
-        addr48_t src;
+        uint8_t src[ETH_ADDR_SIZE];
         /** Ethertype or Length */
         uint16_t etype_len;
@@ -68 +67 @@
         uint16_t opcode;
         /** Sender hardware address */
-        addr48_t sender_hw_addr;
+        uint8_t sender_hw_addr[ETH_ADDR_SIZE];
         /** Sender protocol address */
-        addr32_t sender_proto_addr;
+        uint32_t sender_proto_addr;
         /** Target hardware address */
-        addr48_t target_hw_addr;
+        uint8_t target_hw_addr[ETH_ADDR_SIZE];
         /** Target protocol address */
-        addr32_t target_proto_addr;
+        uint32_t target_proto_addr;
 } __attribute__((packed)) arp_eth_packet_fmt_t;
 
@@ -88 +87 @@
 /** IP Ethertype */
 enum ether_type {
-        ETYPE_ARP  = 0x0806,
-        ETYPE_IP   = 0x0800,
-        ETYPE_IPV6 = 0x86DD
+        ETYPE_ARP = 0x0806,
+        ETYPE_IP  = 0x0800
 };
+
 
 #endif