X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Factions.h;h=3067bf72d60021167e55b2e6db3d513c64e05cfa;hb=e05924baf0c757b579eef2b3743130ade4b1a93c;hp=065c0e40e7e0d0c7bcddf40151975130b3006975;hpb=d17ee8689bff22541dccaa792b70a848641f3646;p=openvswitch

diff --git a/datapath/actions.h b/datapath/actions.h
index 065c0e40..3067bf72 100644
--- 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
@@ -9,17 +9,15 @@
 #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;
-union odp_action;
 
-int dp_xmit_skb(struct sk_buff *);
 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 */