From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mogw0807.ocn.ad.jp (mogw0807.ocn.ad.jp [153.149.234.8]) by dpdk.org (Postfix) with ESMTP id 834171E25 for ; Mon, 23 Apr 2018 08:29:07 +0200 (CEST) Received: from mf-smf-ucb021c2 (mf-smf-ucb021c2.ocn.ad.jp [153.153.66.137]) by mogw0807.ocn.ad.jp (Postfix) with ESMTP id 0F384A00474; Mon, 23 Apr 2018 15:29:06 +0900 (JST) Received: from ntt.pod01.mv-mta-ucb024 ([153.149.142.98]) by mf-smf-ucb021c2 with ESMTP id AUyGfZe2fmomCAUyHfaO81; Mon, 23 Apr 2018 15:29:06 +0900 Received: from smtp.ocn.ne.jp ([153.149.227.134]) by ntt.pod01.mv-mta-ucb024 with id diV51x00B2ud8JZ01iV5ie; Mon, 23 Apr 2018 06:29:05 +0000 Received: from localhost.localdomain (sp1-72-1-217.msc.spmode.ne.jp [1.72.1.217]) by smtp.ocn.ne.jp (Postfix) with ESMTPA; Mon, 23 Apr 2018 15:29:05 +0900 (JST) From: ogawa.yasufumi@lab.ntt.co.jp To: ferruh.yigit@intel.com, geminoa@juno.ocn.ne.jp Cc: spp@dpdk.org, ogawa.yasufumi@lab.ntt.co.jp Date: Mon, 23 Apr 2018 15:28:44 +0900 Message-Id: <20180423055414.7049-4-ogawa.yasufumi@lab.ntt.co.jp> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20180423055414.7049-1-ogawa.yasufumi@lab.ntt.co.jp> References: <20180423055414.7049-1-ogawa.yasufumi@lab.ntt.co.jp> X-Account-Key: account3 X-UIDL: 10332.xyeTlnd8TP7yHkmUyCISMljcz3A= X-Mozilla-Status: 0000 Received: from mzcmta031.ocn.ad.jp (LHLO mzcmta031.ocn.ad.jp) (153.149.235.165) by mzcstore251.ocn.ad.jp with LMTP; Mon, 23 Apr 2018 14:54:18 +0900 (JST) Received: from mfgw692.ocn.ad.jp (mfgw692.ocn.ad.jp [153.153.63.102]) by mzcmta031.ocn.ad.jp (Postfix) with ESMTP id 958ECA03005F for ; Mon, 23 Apr 2018 14:54:18 +0900 (JST) Received-SPF: softfail (mf-ofc-ucb069: domain of transitioning dose not designate client-ip as permitted sender) client-ip=118.23.178.141; envelope-from=; helo=mogw0501.ocn.ad.jp; Authentication-Results: mf-ofc-ucb069; spf=softfail smtp.mailfrom=ogawa.yasufumi@lab.ntt.co.jp Received: from mogw0501.ocn.ad.jp (mogw0501.ocn.ad.jp [118.23.178.141]) by mfgw692.ocn.ad.jp (Postfix) with ESMTP id 2906AA802A0 for ; Mon, 23 Apr 2018 14:54:18 +0900 (JST) Received: from mf-smf-ucb027c1 (mf-smf-ucb027c1.ocn.ad.jp [153.153.66.169]) by mogw0501.ocn.ad.jp (Postfix) with ESMTP id BBE2F4502A9; Mon, 23 Apr 2018 14:54:17 +0900 (JST) Received: from ntt.pod01.mv-mta-ucb019 ([153.149.142.82]) by mf-smf-ucb027c1 with ESMTP id AUQJfZ7RJ8d74AUQbfDPOt; Mon, 23 Apr 2018 14:54:17 +0900 Received: from smtp.ocn.ne.jp ([153.149.227.133]) by ntt.pod01.mv-mta-ucb019 with id dhuH1x0042tKTyH01huH1Y; Mon, 23 Apr 2018 05:54:17 +0000 Received: from localhost.localdomain (sp1-72-1-217.msc.spmode.ne.jp [1.72.1.217]) by smtp.ocn.ne.jp (Postfix) with ESMTPA; Mon, 23 Apr 2018 14:54:17 +0900 (JST) X-Mailer: git-send-email 2.13.1 In-Reply-To: <20180423055414.7049-1-ogawa.yasufumi@lab.ntt.co.jp> References: <20180423055414.7049-1-ogawa.yasufumi@lab.ntt.co.jp> Subject: [spp] [PATCH 3/7] spp_nfv: convert license to SPDX tag X-BeenThere: spp@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Soft Patch Panel List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Apr 2018 06:29:08 -0000 From: ogawa.yasufumi@lab.ntt.co.jp From: Yasufumi Ogawa Signed-off-by: Yasufumi Ogawa --- src/nfv/Makefile | 32 ++------------------------------ src/nfv/nfv.c | 34 +++------------------------------- 2 files changed, 5 insertions(+), 61 deletions(-) diff --git a/src/nfv/Makefile b/src/nfv/Makefile index aab58a7..4d5eec6 100644 --- a/src/nfv/Makefile +++ b/src/nfv/Makefile @@ -1,33 +1,5 @@ -# BSD LICENSE -# -# Copyright(c) 2015-2016 Intel Corporation. All rights reserved. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Intel Corporation nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2015-2016 Intel Corporation ifeq ($(RTE_SDK),) $(error "Please define RTE_SDK environment variable") diff --git a/src/nfv/nfv.c b/src/nfv/nfv.c index f677691..e4e98ee 100644 --- a/src/nfv/nfv.c +++ b/src/nfv/nfv.c @@ -1,34 +1,6 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2015-2016 Intel Corporation. All rights reserved. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2015-2016 Intel Corporation + * Copyright(c) 2017-2018 Nippon Telegraph and Telephone Corporation */ #include -- 2.13.1