projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nx-match: Implement support for arbitrary VLAN TCI masks.
[openvswitch]
/
datapath
/
flow.h
diff --git
a/datapath/flow.h
b/datapath/flow.h
index 80a5b66b1018a84aa193d92b9009c5c9f30ac1f6..b1e80057526489efde4af3496b70a7c435913f82 100644
(file)
--- a/
datapath/flow.h
+++ b/
datapath/flow.h
@@
-13,7
+13,6
@@
#include <linux/spinlock.h>
#include <linux/types.h>
#include <linux/rcupdate.h>
#include <linux/spinlock.h>
#include <linux/types.h>
#include <linux/rcupdate.h>
-#include <linux/gfp.h>
#include <linux/if_ether.h>
#include <linux/jiffies.h>
#include <linux/time.h>
#include <linux/if_ether.h>
#include <linux/jiffies.h>
#include <linux/time.h>
@@
-36,6
+35,9
@@
struct sw_flow {
struct odp_flow_key key;
struct sw_flow_actions *sf_acts;
struct odp_flow_key key;
struct sw_flow_actions *sf_acts;
+ atomic_t refcnt;
+ bool dead;
+
spinlock_t lock; /* Lock for values below. */
unsigned long used; /* Last used time (in jiffies). */
u64 packet_count; /* Number of packets matched. */
spinlock_t lock; /* Lock for values below. */
unsigned long used; /* Last used time (in jiffies). */
u64 packet_count; /* Number of packets matched. */
@@
-58,20
+60,24
@@
struct arp_eth_header
unsigned char ar_tip[4]; /* target IP address */
} __attribute__((packed));
unsigned char ar_tip[4]; /* target IP address */
} __attribute__((packed));
-extern struct kmem_cache *flow_cache;
+int flow_init(void);
+void flow_exit(void);
-struct sw_flow
_actions *flow_actions_alloc(size_t n_actions
);
+struct sw_flow
*flow_alloc(void
);
void flow_deferred_free(struct sw_flow *);
void flow_deferred_free(struct sw_flow *);
+void flow_free_tbl(struct tbl_node *);
+
+struct sw_flow_actions *flow_actions_alloc(size_t n_actions);
void flow_deferred_free_acts(struct sw_flow_actions *);
void flow_deferred_free_acts(struct sw_flow_actions *);
-int flow_extract(struct sk_buff *, u16 in_port, struct odp_flow_key *);
+
+void flow_hold(struct sw_flow *);
+void flow_put(struct sw_flow *);
+
+int flow_extract(struct sk_buff *, u16 in_port, struct odp_flow_key *, bool *is_frag);
void flow_used(struct sw_flow *, struct sk_buff *);
u32 flow_hash(const struct odp_flow_key *key);
int flow_cmp(const struct tbl_node *, void *target);
void flow_used(struct sw_flow *, struct sk_buff *);
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);
static inline struct sw_flow *flow_cast(const struct tbl_node *node)
{
static inline struct sw_flow *flow_cast(const struct tbl_node *node)
{