openvswitch: Remove vport-net

This structure is not used anymore.

Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/openvswitch/datapath.h b/net/openvswitch/datapath.h
index da15fd3f3c3403a6b6ff8076ed0556c6c3c085d2..c05b7d9e7bf2225bf6d4c28f06427aaaa8b32458 100644 (file)
--- a/net/openvswitch/datapath.h
+++ b/net/openvswitch/datapath.h
@@ -30,7 +30,6 @@
 #include "conntrack.h"
 #include "flow.h"
 #include "flow_table.h"
-#include "vport.h"
 
 #define DP_MAX_PORTS           USHRT_MAX
 #define DP_VPORT_HASH_BUCKETS  1024
@@ -134,7 +133,6 @@ struct dp_upcall_info {
 struct ovs_net {
        struct list_head dps;
        struct work_struct dp_notify_work;
-       struct vport_net vport_net;
 
        /* Module reference for configuring conntrack. */
        bool xt_label;

diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c
index 9db87331e2111144b223d831045715d928ce4d2f..bed8d09230cdb4efa4e2a73e531303709684ef25 100644 (file)
--- a/net/openvswitch/flow.c
+++ b/net/openvswitch/flow.c
@@ -46,10 +46,11 @@
 #include <net/mpls.h>
 #include <net/ndisc.h>
 
+#include "conntrack.h"
 #include "datapath.h"
 #include "flow.h"
 #include "flow_netlink.h"
-#include "conntrack.h"
+#include "vport.h"
 
 u64 ovs_flow_used_time(unsigned long flow_jiffies)
 {

diff --git a/net/openvswitch/vport.h b/net/openvswitch/vport.h
index 30615edc084bb038d964ae3a08b101d22b71369c..4b6f4a5296c3fcf6b76f5f7e8bc962a99efd532f 100644 (file)
--- a/net/openvswitch/vport.h
+++ b/net/openvswitch/vport.h
@@ -36,10 +36,6 @@ struct vport_parms;
 
 /* The following definitions are for users of the vport subsytem: */
 
-struct vport_net {
-       struct vport __rcu *gre_vport;
-};
-
 int ovs_vport_init(void);
 void ovs_vport_exit(void);