X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fflow.h;h=f0e7697577ef349787e84303fa6a1744ae41d9fd;hb=abfec865566e6cce961cc8660de1ddfdc85dae5f;hp=55efede1b885bcda48c3abc57eda91bf3858786f;hpb=064af42167bf4fc9aaea2702d80ce08074b889c0;p=openvswitch

diff --git a/datapath/flow.h b/datapath/flow.h
index 55efede1..f0e76975 100644
--- a/datapath/flow.h
+++ b/datapath/flow.h
@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2009, 2010 Nicira Networks.
+ * Distributed under the terms of the GNU GPL version 2.
+ *
+ * Significant portions of this file may be copied from parts of the Linux
+ * kernel, by Linus Torvalds and others.
+ */
+
 #ifndef FLOW_H
 #define FLOW_H 1
 
@@ -6,8 +14,11 @@
 #include <linux/types.h>
 #include <linux/rcupdate.h>
 #include <linux/gfp.h>
+#include <linux/jiffies.h>
+#include <linux/time.h>
 
 #include "openvswitch/datapath-protocol.h"
+#include "table.h"
 
 struct sk_buff;
 
@@ -19,14 +30,13 @@ struct sw_flow_actions {
 
 struct sw_flow {
 	struct rcu_head rcu;
+	struct tbl_node tbl_node;
+
 	struct odp_flow_key key;
 	struct sw_flow_actions *sf_acts;
 
-	struct timespec used;	/* Last used time. */
-
-	u8 ip_tos;		/* IP TOS value. */
-
 	spinlock_t lock;	/* Lock for values below. */
+	unsigned long used;	/* Last used time (in jiffies). */
 	u64 packet_count;	/* Number of packets matched. */
 	u64 byte_count;		/* Number of bytes matched. */
 	u8 tcp_flags;		/* Union of seen TCP flags. */
@@ -35,13 +45,15 @@ struct sw_flow {
 extern struct kmem_cache *flow_cache;
 
 struct sw_flow_actions *flow_actions_alloc(size_t n_actions);
-void flow_free(struct sw_flow *);
 void flow_deferred_free(struct sw_flow *);
 void flow_deferred_free_acts(struct sw_flow_actions *);
 int flow_extract(struct sk_buff *, u16 in_port, struct odp_flow_key *);
 void flow_used(struct sw_flow *, struct sk_buff *);
 
-void print_flow(const struct odp_flow_key *);
+struct sw_flow *flow_cast(const struct tbl_node *);
+u32 flow_hash(const struct odp_flow_key *key);
+int flow_cmp(const struct tbl_node *, void *target);
+void flow_free_tbl(struct tbl_node *);
 
 int flow_init(void);
 void flow_exit(void);