Debian: fail gracefully if modules can't be loaded on install

[openvswitch] / datapath / actions.h

diff --git a/datapath/actions.h b/datapath/actions.h
index a2585516414bc5dabf55021172eec91a5b4cf061..a832295ce8043fefcc936eff8f64b82fe535ec62 100644 (file)
--- a/datapath/actions.h
+++ b/datapath/actions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2010 Nicira Networks.
+ * Copyright (c) 2009, 2010, 2011 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
@@ -14,11 +14,15 @@
 
 struct datapath;
 struct sk_buff;
-struct odp_flow_key;
-union odp_action;
+struct sw_flow_key;
 
-int execute_actions(struct datapath *dp, struct sk_buff *skb,
-                   const struct odp_flow_key *key,
-                   const union odp_action *, int n_actions);
+int execute_actions(struct datapath *dp, struct sk_buff *skb);
+
+static inline void skb_clear_rxhash(struct sk_buff *skb)
+{
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)
+       skb->rxhash = 0;
+#endif
+}
 
 #endif /* actions.h */