netdev: Fix carrier status for down interfaces.

[sliver-openvswitch.git] / datapath / actions.h

diff --git a/datapath/actions.h b/datapath/actions.h
index 9dfca36..f2962a7 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,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