X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fdatapath.h;h=b5200848b10b39acc51bd34f8474a4f6dd817f10;hb=1d87357a1322c2faa290452c08c7f794c0be848b;hp=3706219e0ad5788e26f33e8b492c3a485e4d4e4c;hpb=e3fdfed11b8c56aa6a8deffe11a552fed7e7adbc;p=openvswitch

diff --git a/datapath/datapath.h b/datapath/datapath.h
index 3706219e..b5200848 100644
--- a/datapath/datapath.h
+++ b/datapath/datapath.h
@@ -20,9 +20,7 @@
 #include <linux/skbuff.h>
 #include <linux/version.h>
 #include "flow.h"
-#include "brc_sysfs.h"
-
-struct sk_buff;
+#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. */
@@ -67,13 +65,7 @@ struct datapath {
 	struct mutex mutex;
 	int dp_idx;
 
-#ifdef CONFIG_SYSFS
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
 	struct kobject ifobj;
-#else
-	struct kobject *ifobj;
-#endif
-#endif
 
 	int drop_frags;
 
@@ -101,18 +93,13 @@ struct net_bridge_port {
 	u16 port_no;
 	struct datapath	*dp;
 	struct net_device *dev;
-#ifdef CONFIG_SYSFS
 	struct kobject kobj;
-#endif
+	char linkname[IFNAMSIZ];
 	struct list_head node;   /* Element in datapath.ports. */
 };
 
 extern struct notifier_block dp_device_notifier;
 extern int (*dp_ioctl_hook)(struct net_device *dev, struct ifreq *rq, int cmd);
-extern int (*dp_add_dp_hook)(struct datapath *dp);
-extern int (*dp_del_dp_hook)(struct datapath *dp);
-extern int (*dp_add_if_hook)(struct net_bridge_port *p);
-extern int (*dp_del_if_hook)(struct net_bridge_port *p);
 
 /* Flow table. */
 struct dp_table *dp_table_create(unsigned int n_buckets);
@@ -127,11 +114,9 @@ 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 *);
+int dp_min_mtu(const struct datapath *dp);
 
 struct datapath *get_dp(int dp_idx);
 
@@ -149,4 +134,6 @@ static inline int skb_checksum_setup(struct sk_buff *skb)
 }
 #endif
 
+int vswitch_skb_checksum_setup(struct sk_buff *skb);
+
 #endif /* datapath.h */