X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=datapath%2Fflow.h;h=21df5fbee1a784fba7846f768cd0be2d9985d961;hb=0a6f55420508c31af9fe41aafdd26ce8462cc1be;hp=be734532c2082e0a80db2f22c868d08b43c787c0;hpb=ec58547a81246c0f3f7a03ab28ba1a78f1988235;p=openvswitch

diff --git a/datapath/flow.h b/datapath/flow.h
index be734532..21df5fbe 100644
--- a/datapath/flow.h
+++ b/datapath/flow.h
@@ -31,8 +31,17 @@ struct sw_flow_actions {
 
 struct sw_flow_key {
 	__be64	tun_id;     /* Encapsulating tunnel ID. */
-	__be32	nw_src;	    /* IP source address. */
-	__be32	nw_dst;	    /* IP destination address. */
+	union {
+		struct {
+			__be32	ipv4_src;	 /* IPv4 source address. */
+			__be32	ipv4_dst;	 /* IPv4 destination address. */
+		};
+		struct {
+			__be32	ipv6_src[4]; /* IPv6 source address. */
+			__be32	ipv6_dst[4]; /* IPv6 source address. */
+		};
+	};
+	__be32	nd_target[4]; /* IPv6 ND target address. */
 	u16	in_port;    /* Input switch port. */
 	__be16	dl_tci;	    /* 0 if no VLAN, VLAN_TAG_PRESENT set otherwise. */
 	__be16	dl_type;    /* Ethernet frame type. */
@@ -42,6 +51,8 @@ struct sw_flow_key {
 	u8	dl_dst[ETH_ALEN]; /* Ethernet destination address. */
 	u8	nw_proto;   /* IP protocol or lower 8 bits of ARP opcode. */
 	u8	nw_tos;	    /* IP ToS (DSCP field, 6 bits). */
+	u8	arp_sha[ETH_ALEN]; /* ARP/ND source hardware address. */
+	u8	arp_tha[ETH_ALEN]; /* ARP/ND target hardware address. */
 };
 
 struct sw_flow {