diff mbox

[ovs-dev,3/6] datapath: remove net namespace

Message ID 1469124857-30036-4-git-send-email-cascardo@redhat.com
State Accepted
Delegated to: pravin shelar
Headers show

Commit Message

Thadeu Lima de Souza Cascardo July 21, 2016, 6:14 p.m. UTC 
The code that used that module was already removed when some support for Linux
older than 3.10 was removed.

Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@redhat.com>
---
 datapath/linux/Modules.mk             |  1 -
 datapath/linux/compat/net_namespace.c | 43 -----------------------------------
 2 files changed, 44 deletions(-)
 delete mode 100644 datapath/linux/compat/net_namespace.c
diff mbox

Patch

diff --git a/datapath/linux/Modules.mk b/datapath/linux/Modules.mk
index 8f30fe1..b0e4618 100644
--- a/datapath/linux/Modules.mk
+++ b/datapath/linux/Modules.mk
@@ -15,7 +15,6 @@  openvswitch_sources += \
 	linux/compat/ip6_output.c \
 	linux/compat/lisp.c \
 	linux/compat/netdevice.c \
-	linux/compat/net_namespace.c \
 	linux/compat/nf_conntrack_core.c \
 	linux/compat/nf_conntrack_reasm.c \
 	linux/compat/reassembly.c \
diff --git a/datapath/linux/compat/net_namespace.c b/datapath/linux/compat/net_namespace.c
deleted file mode 100644
index 4a9b1d6..0000000
--- a/datapath/linux/compat/net_namespace.c
+++ /dev/null
@@ -1,43 +0,0 @@ 
-#include <linux/if_vlan.h>
-#include <linux/netdevice.h>
-#include <net/net_namespace.h>
-#include <net/netns/generic.h>
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)
-
-int ovs_compat_init_net(struct net *net, struct rpl_pernet_operations *pnet)
-{
-	int err;
-	void *ovs_net = kzalloc(pnet->size, GFP_KERNEL);
-
-	if (!ovs_net)
-		return -ENOMEM;
-
-	err = net_assign_generic(net, *pnet->id, ovs_net);
-	if (err)
-		goto err;
-
-	if (pnet->init) {
-		err = pnet->init(net);
-		if (err)
-			goto err;
-	}
-
-	return 0;
-err:
-	kfree(ovs_net);
-	return err;
-}
-EXPORT_SYMBOL_GPL(ovs_compat_init_net);
-
-void ovs_compat_exit_net(struct net *net, struct rpl_pernet_operations *pnet)
-{
-	void *ovs_net = net_generic(net, *pnet->id);
-
-	if (pnet->exit)
-		pnet->exit(net);
-	kfree(ovs_net);
-}
-EXPORT_SYMBOL_GPL(ovs_compat_exit_net);
-
-#endif