Use Autotest for the Open vSwitch test suite.

[openvswitch] / datapath / datapath.h

diff --git a/datapath/datapath.h b/datapath/datapath.h
index 102b27f31f1af633d65bddd0333356297fe59425..989dcd4b35807eb1e3e994b87cb23937c90a0885 100644 (file)
--- a/datapath/datapath.h
+++ b/datapath/datapath.h
@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2009 Nicira Networks.
+ * Distributed under the terms of the GNU GPL version 2.
+ *
+ * Significant portions of this file may be copied from parts of the Linux
+ * kernel, by Linus Torvalds and others.
+ */
+
 /* Interface exported by openvswitch_mod. */
 
 #ifndef DATAPATH_H
@@ -10,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
@@ -58,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;
@@ -88,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. */
@@ -114,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);