From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mogw1036.ocn.ad.jp (mogw1036.ocn.ad.jp [153.149.231.42]) by dpdk.org (Postfix) with ESMTP id 94A971BA83 for ; Thu, 10 May 2018 13:11:42 +0200 (CEST) Received: from mf-smf-ucb021c3 (mf-smf-ucb021c3.ocn.ad.jp [153.153.66.138]) by mogw1036.ocn.ad.jp (Postfix) with ESMTP id 2443DB80239; Thu, 10 May 2018 20:11:41 +0900 (JST) Received: from ntt.pod01.mv-mta-ucb022 ([153.149.142.85]) by mf-smf-ucb021c3 with ESMTP id GjU5f4ccSN8XpGjU5fXnNN; Thu, 10 May 2018 20:11:41 +0900 Received: from smtp.ocn.ne.jp ([153.149.227.134]) by ntt.pod01.mv-mta-ucb022 with id kbBg1x00F2ud8JZ01bBgPu; Thu, 10 May 2018 11:11:41 +0000 Received: from localhost.localdomain (sp1-66-97-253.msc.spmode.ne.jp [1.66.97.253]) by smtp.ocn.ne.jp (Postfix) with ESMTPA; Thu, 10 May 2018 20:11:40 +0900 (JST) From: ogawa.yasufumi@lab.ntt.co.jp To: ferruh.yigit@intel.com Cc: spp@dpdk.org, tdelanerolle@linuxfoundation.org, tim.odriscoll@intel.com, jim.st.leger@intel.com, Yasufumi Ogawa Date: Thu, 10 May 2018 20:10:19 +0900 Message-Id: <20180510111028.33837-5-ogawa.yasufumi@lab.ntt.co.jp> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20180510111028.33837-1-ogawa.yasufumi@lab.ntt.co.jp> References: <20180423055414.7049-1-ogawa.yasufumi@lab.ntt.co.jp> <20180510111028.33837-1-ogawa.yasufumi@lab.ntt.co.jp> Subject: [spp] [PATCH v2 04/13] 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: Thu, 10 May 2018 11:11:43 -0000 From: Yasufumi Ogawa Signed-off-by: Yasufumi Ogawa --- src/nfv/Makefile | 32 ++------------------------------ src/nfv/nfv.c | 33 ++------------------------------- 2 files changed, 4 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..c46afa0 100644 --- a/src/nfv/nfv.c +++ b/src/nfv/nfv.c @@ -1,34 +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 */ #include -- 2.13.1