summaryrefslogtreecommitdiffstats
path: root/net/openvswitch
diff options
context:
space:
mode:
authorPravin B Shelar <pshelar@nicira.com>2015-08-29 17:44:08 -0700
committerDavid S. Miller <davem@davemloft.net>2015-08-29 19:07:15 -0700
commita581b96dbfc52b6b498552525ec929aa635680ed (patch)
tree3c81528ffd67274aadcb8c3f54f727489d125e07 /net/openvswitch
parent8c876639c98501b049269b554bf4ecbb8f9c012f (diff)
downloadop-kernel-dev-a581b96dbfc52b6b498552525ec929aa635680ed.zip
op-kernel-dev-a581b96dbfc52b6b498552525ec929aa635680ed.tar.gz
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>
Diffstat (limited to 'net/openvswitch')
-rw-r--r--net/openvswitch/datapath.h2
-rw-r--r--net/openvswitch/flow.c3
-rw-r--r--net/openvswitch/vport.h4
3 files changed, 2 insertions, 7 deletions
diff --git a/net/openvswitch/datapath.h b/net/openvswitch/datapath.h
index da15fd3..c05b7d9 100644
--- 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 9db8733..bed8d09 100644
--- 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 30615ed..4b6f4a5 100644
--- 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);
OpenPOWER on IntegriCloud