From 0a84c1d539d6775eb8decef406892e032c9d1b23 Mon Sep 17 00:00:00 2001 From: Thadeu Lima de Souza Cascardo Date: Thu, 21 Jul 2016 11:14:14 -0700 Subject: [PATCH] datapath: remove net namespace 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 Acked-by: Pravin B Shelar --- 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 --git a/datapath/linux/Modules.mk b/datapath/linux/Modules.mk index 8f30fe19e..b0e4618cf 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 4a9b1d648..000000000 --- a/datapath/linux/compat/net_namespace.c +++ /dev/null @@ -1,43 +0,0 @@ -#include -#include -#include -#include - -#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 -- 2.20.1