X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fdatapath.h;h=c6ec86a3993f6c043761c5982428639284be383e;hb=c798b21c6a;hp=455580f06f4bcf9a50500b9c54eb482b41c48597;hpb=72ca14c15430b1e06b06fa2042dab347c1c7d7df;p=openvswitch

diff --git a/datapath/datapath.h b/datapath/datapath.h
index 455580f0..c6ec86a3 100644
--- a/datapath/datapath.h
+++ b/datapath/datapath.h
@@ -18,6 +18,7 @@
 #include <linux/netdevice.h>
 #include <linux/workqueue.h>
 #include <linux/skbuff.h>
+#include <linux/version.h>
 #include "flow.h"
 #include "brc_sysfs.h"
 
@@ -64,8 +65,12 @@ struct datapath {
 	struct mutex mutex;
 	int dp_idx;
 
-#ifdef SUPPORT_SYSFS
+#ifdef CONFIG_SYSFS
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
 	struct kobject ifobj;
+#else
+	struct kobject *ifobj;
+#endif
 #endif
 
 	int drop_frags;
@@ -94,7 +99,7 @@ struct net_bridge_port {
 	u16 port_no;
 	struct datapath	*dp;
 	struct net_device *dev;
-#ifdef SUPPORT_SYSFS
+#ifdef CONFIG_SYSFS
 	struct kobject kobj;
 #endif
 	struct list_head node;   /* Element in datapath.ports. */
@@ -139,4 +144,6 @@ static inline int skb_checksum_setup(struct sk_buff *skb)
 }
 #endif
 
+int vswitch_skb_checksum_setup(struct sk_buff *skb);
+
 #endif /* datapath.h */