X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fflow.h;h=ee1c4c92a7b1d36811917df2b0952d978ec250f3;hb=d31f1109f10e5ffb9bf266306b913ebf23781666;hp=78d5a7019c00b5d02f33a9aa6f81b63308a5f19b;hpb=37a1300c3ca05a97160d44dc34298c447b50ed9d;p=sliver-openvswitch.git

diff --git a/datapath/flow.h b/datapath/flow.h
index 78d5a7019..ee1c4c92a 100644
--- a/datapath/flow.h
+++ b/datapath/flow.h
@@ -31,8 +31,16 @@ 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. */
+		};
+	};
 	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 +50,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 source hardware address. */
+	u8	arp_tha[ETH_ALEN]; /* ARP target hardware address. */
 };
 
 struct sw_flow {
@@ -91,6 +101,7 @@ void flow_put(struct sw_flow *);
 
 int flow_extract(struct sk_buff *, u16 in_port, struct sw_flow_key *, bool *is_frag);
 void flow_used(struct sw_flow *, struct sk_buff *);
+u64 flow_used_time(unsigned long flow_jiffies);
 
 u32 flow_hash(const struct sw_flow_key *);
 int flow_cmp(const struct tbl_node *, void *target);