From patchwork Thu Jul 21 18:14:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thadeu Lima de Souza Cascardo X-Patchwork-Id: 651358 X-Patchwork-Delegate: pshelar@ovn.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (archives.nicira.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 3rwMPs58pgz9sxS for ; Fri, 22 Jul 2016 04:14:57 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id D873810C58; Thu, 21 Jul 2016 11:14:37 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx1e3.cudamail.com (mx1.cudamail.com [69.90.118.67]) by archives.nicira.com (Postfix) with ESMTPS id C7DBA10C4A for ; Thu, 21 Jul 2016 11:14:36 -0700 (PDT) Received: from bar5.cudamail.com (localhost [127.0.0.1]) by mx1e3.cudamail.com (Postfix) with ESMTPS id 507FE4203AE for ; Thu, 21 Jul 2016 12:14:36 -0600 (MDT) X-ASG-Debug-ID: 1469124875-09eadd5bd3161df0001-byXFYA Received: from mx1-pf2.cudamail.com ([192.168.24.2]) by bar5.cudamail.com with ESMTP id t82wPvp0fFm6E1M2 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 21 Jul 2016 12:14:35 -0600 (MDT) X-Barracuda-Envelope-From: cascardo@redhat.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.2 Received: from unknown (HELO mx1.redhat.com) (209.132.183.28) by mx1-pf2.cudamail.com with ESMTPS (DHE-RSA-AES256-SHA encrypted); 21 Jul 2016 18:14:35 -0000 Received-SPF: pass (mx1-pf2.cudamail.com: SPF record at _spf1.redhat.com designates 209.132.183.28 as permitted sender) X-Barracuda-Apparent-Source-IP: 209.132.183.28 X-Barracuda-RBL-IP: 209.132.183.28 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 80E7BC05AA5A for ; Thu, 21 Jul 2016 18:14:34 +0000 (UTC) Received: from indiana.gru.redhat.com (ovpn-116-65.phx2.redhat.com [10.3.116.65]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u6LIEQig019357 for ; Thu, 21 Jul 2016 14:14:33 -0400 X-CudaMail-Envelope-Sender: cascardo@redhat.com From: Thadeu Lima de Souza Cascardo To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-E2-720050581 X-CudaMail-DTE: 072116 X-CudaMail-Originating-IP: 209.132.183.28 Date: Thu, 21 Jul 2016 15:14:14 -0300 X-ASG-Orig-Subj: [##CM-E2-720050581##][PATCH 3/6] datapath: remove net namespace Message-Id: <1469124857-30036-4-git-send-email-cascardo@redhat.com> In-Reply-To: <1469124857-30036-1-git-send-email-cascardo@redhat.com> References: <1469124857-30036-1-git-send-email-cascardo@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 21 Jul 2016 18:14:34 +0000 (UTC) X-Barracuda-Connect: UNKNOWN[192.168.24.2] X-Barracuda-Start-Time: 1469124875 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-ASG-Whitelist: Header =?UTF-8?B?eFwtY3VkYW1haWxcLXdoaXRlbGlzdFwtdG8=?= X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 Subject: [ovs-dev] [PATCH 3/6] datapath: remove net namespace X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" 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 --- 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 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 -#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