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

diff --git a/datapath/datapath.h b/datapath/datapath.h
index db243493..c6ec86a3 100644
--- a/datapath/datapath.h
+++ b/datapath/datapath.h
@@ -18,11 +18,10 @@
 #include <linux/netdevice.h>
 #include <linux/workqueue.h>
 #include <linux/skbuff.h>
+#include <linux/version.h>
 #include "flow.h"
 #include "brc_sysfs.h"
 
-struct sk_buff;
-
 /* 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
@@ -66,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;
@@ -96,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. */
@@ -122,11 +125,8 @@ int dp_table_foreach(struct dp_table *table,
 		     void *aux);
 
 void dp_process_received_packet(struct sk_buff *, struct net_bridge_port *);
-int dp_del_port(struct net_bridge_port *, struct list_head *);
-int dp_output_port(struct datapath *, struct sk_buff *, int out_port,
-		   int ignore_no_fwd);
+int dp_del_port(struct net_bridge_port *);
 int dp_output_control(struct datapath *, struct sk_buff *, int, u32 arg);
-void dp_set_origin(struct datapath *, u16, struct sk_buff *);
 
 struct datapath *get_dp(int dp_idx);
 
@@ -144,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 */