projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
odp-util: Improve formatting of bogus empty action attributes.
[openvswitch]
/
datapath
/
actions.h
diff --git
a/datapath/actions.h
b/datapath/actions.h
index bda6d55a3a3b94680064b7bf68923860ef72d9cf..3067bf72d60021167e55b2e6db3d513c64e05cfa 100644
(file)
--- a/
datapath/actions.h
+++ b/
datapath/actions.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
@@
-9,18
+9,15
@@
#ifndef ACTIONS_H
#define ACTIONS_H 1
#ifndef ACTIONS_H
#define ACTIONS_H 1
-#include <linux/gfp.h>
+#include <linux/skbuff.h>
+#include <linux/version.h>
struct datapath;
struct sk_buff;
struct odp_flow_key;
struct datapath;
struct sk_buff;
struct odp_flow_key;
-union odp_action;
-struct sk_buff *make_writable(struct sk_buff *, gfp_t gfp);
-int dp_xmit_skb(struct sk_buff *);
int execute_actions(struct datapath *dp, struct sk_buff *skb,
int execute_actions(struct datapath *dp, struct sk_buff *skb,
- struct odp_flow_key *key,
- const union odp_action *, int n_actions,
- gfp_t gfp);
+ const struct odp_flow_key *key,
+ const struct nlattr *, u32 actions_len);
#endif /* actions.h */
#endif /* actions.h */