nx-match: Implement support for arbitrary VLAN TCI masks.

[openvswitch] / datapath / actions.h

diff --git a/datapath/actions.h b/datapath/actions.h
index 09e35bd7a8837feb55f5bd2690a838ddec58f35d..f2962a73fbbfa22344f2a1be5faaba777c060403 100644 (file)
--- a/datapath/actions.h
+++ b/datapath/actions.h
@@ -9,8 +9,8 @@
 #ifndef ACTIONS_H
 #define ACTIONS_H 1
 
-#include <linux/gfp.h>
 #include <linux/skbuff.h>
+#include <linux/version.h>
 
 struct datapath;
 struct sk_buff;
@@ -18,9 +18,8 @@ struct odp_flow_key;
 union odp_action;
 
 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 union odp_action *, int n_actions);
 
 static inline void set_skb_csum_bits(const struct sk_buff *old_skb,
                                     struct sk_buff *new_skb)