Correct dameon options in INSTALL.bridge

[openvswitch] / datapath / datapath.h

diff --git a/datapath/datapath.h b/datapath/datapath.h
index eee1bbfc585f1cf38aef4fca9f230077365518ab..9b4c4386bd5f262a058411e164e47e57b89a9255 100644 (file)
--- a/datapath/datapath.h
+++ b/datapath/datapath.h
@@ -14,16 +14,17 @@
 #include <asm/page.h>
 #include <linux/kernel.h>
 #include <linux/mutex.h>
-#include <linux/netlink.h>
 #include <linux/netdevice.h>
 #include <linux/workqueue.h>
 #include <linux/skbuff.h>
+#include <linux/version.h>
 #include "flow.h"
 #include "dp_sysfs.h"
 
 /* Mask for the priority bits in a vlan header.  If we ever merge upstream
  * then this should go into include/linux/if_vlan.h. */
 #define VLAN_PCP_MASK 0xe000
+#define VLAN_PCP_SHIFT 13
 
 #define DP_MAX_PORTS 1024
 #define DP_MAX_GROUPS 16
@@ -167,4 +168,6 @@ static inline int skb_checksum_setup(struct sk_buff *skb)
 }
 #endif
 
+int vswitch_skb_checksum_setup(struct sk_buff *skb);
+
 #endif /* datapath.h */