Merge citrix into master.

[sliver-openvswitch.git] / datapath / datapath.h

diff --git a/datapath/datapath.h b/datapath/datapath.h
index c6ec86a..b520084 100644 (file)
--- a/datapath/datapath.h
+++ b/datapath/datapath.h
@@ -20,7 +20,7 @@
 #include <linux/skbuff.h>
 #include <linux/version.h>
 #include "flow.h"
-#include "brc_sysfs.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. */
@@ -65,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;
 
@@ -99,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,6 +116,7 @@ int dp_table_foreach(struct dp_table *table,
 void dp_process_received_packet(struct sk_buff *, struct net_bridge_port *);
 int dp_del_port(struct net_bridge_port *);
 int dp_output_control(struct datapath *, struct sk_buff *, int, u32 arg);
+int dp_min_mtu(const struct datapath *dp);
 
 struct datapath *get_dp(int dp_idx);