X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Factions.h;h=f2962a73fbbfa22344f2a1be5faaba777c060403;hb=66642cb40b12594c62f3d3037f1e4efa528416b7;hp=9dfca36594d6738f483604ef99cf8c9ffa61b468;hpb=ff6402a9f0d9ee4c29567b62938c82924d502b92;p=openvswitch

diff --git a/datapath/actions.h b/datapath/actions.h
index 9dfca365..f2962a73 100644
--- 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,12 +18,11 @@ 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)
+static inline void set_skb_csum_bits(const struct sk_buff *old_skb,
+				     struct sk_buff *new_skb)
 {
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
 	/* Before 2.6.24 these fields were not copied when