git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovs-ofctl: Adding support for table ID.
[sliver-openvswitch.git]
/
datapath
/
flow.h
diff --git
a/datapath/flow.h
b/datapath/flow.h
index
44cc3a6
..
c42ae1b
100644
(file)
--- a/
datapath/flow.h
+++ b/
datapath/flow.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2009 Nicira Networks.
+ * 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
* Distributed under the terms of the GNU GPL version 2.
*
* Significant portions of this file may be copied from parts of the Linux
@@
-14,20
+14,24
@@
#include <linux/types.h>
#include <linux/rcupdate.h>
#include <linux/gfp.h>
#include <linux/types.h>
#include <linux/rcupdate.h>
#include <linux/gfp.h>
+#include <linux/time.h>
-#include "openvswitch/datapath-protocol.h"
+#include "openvswitch/xflow.h"
+#include "table.h"
struct sk_buff;
struct sw_flow_actions {
struct rcu_head rcu;
unsigned int n_actions;
struct sk_buff;
struct sw_flow_actions {
struct rcu_head rcu;
unsigned int n_actions;
- union
odp
_action actions[];
+ union
xflow
_action actions[];
};
struct sw_flow {
struct rcu_head rcu;
};
struct sw_flow {
struct rcu_head rcu;
- struct odp_flow_key key;
+ struct tbl_node tbl_node;
+
+ struct xflow_key key;
struct sw_flow_actions *sf_acts;
struct timespec used; /* Last used time. */
struct sw_flow_actions *sf_acts;
struct timespec used; /* Last used time. */
@@
-43,12
+47,16
@@
struct sw_flow {
extern struct kmem_cache *flow_cache;
struct sw_flow_actions *flow_actions_alloc(size_t n_actions);
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 *);
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 *);
+int flow_extract(struct sk_buff *, u16 in_port, struct
x
flow_key *);
void flow_used(struct sw_flow *, struct sk_buff *);
void flow_used(struct sw_flow *, struct sk_buff *);
+struct sw_flow *flow_cast(const struct tbl_node *);
+u32 flow_hash(const struct xflow_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);
int flow_init(void);
void flow_exit(void);