Hi Hermant
On 1/20/2018 12:47 AM, Hemant Agrawal Wrote:
Hi Olivier,
On Fri, Jan 19, 2018 at 07:45:30PM +0530, Hemant Agrawal wrote:
Hi Jia,
On 1/17/2018 9:33 AM, Jia He wrote:
Move the common part of rte_ring.h into rte_ring_generic.h.
Move the memory barrier part into update_tail().
No functional changes here.
Signed-off-by: Jia He <jia...@hxt-semitech.com>
Suggested-by: Jerin Jacob <jerin.ja...@caviumnetworks.com>
Suggested-by: Ananyev Konstantin <konstantin.anan...@intel.com>
Acked-by: Jerin Jacob <jerin.ja...@caviumnetworks.com>
Acked-by: Olivier Matz <olivier.m...@6wind.com>
---
diff --git a/lib/librte_ring/rte_ring_generic.h
b/lib/librte_ring/rte_ring_generic.h
new file mode 100644
index 0000000..01f2cae
--- /dev/null
+++ b/lib/librte_ring/rte_ring_generic.h
@@ -0,0 +1,202 @@
+/*-
+ * Copyright(c) 2017 Intel Corporation. All rights reserved.
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
The SPDX should be first line. See other files for Intel or NXP.
[Hemant] Don't add SPDX to this file.
This file is not BSD-3 licensed. Please keep the full text as in the
original file.
+ */
+
+/*
+ * Derived from FreeBSD's bufring.h
+ *
+
+*********************************************************
**********
+*******
+ *
+ * Copyright (c) 2007-2009 Kip Macy km...@freebsd.org
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or
+without
+ * modification, are permitted provided that the following conditions
are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. The name of Kip Macy nor the names of other
+ * 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.
+ *
+
+*********************************************************
**********
+********/
+
This is BSD-2-freebsd, which is not a approved license for DPDK.
Can you ask Kip Macy, if he/she is ok to re-license it with BSD-3?
Please check with legal, if you can just keep the copyright of Kip
Macy and re license it with BSD-3.
I see the BSD-3 license to be permissive enough to be re-licensed as BSD-3.
But I am not a lawyer.
I agree this is something we should do, as a maintainer of librte_ring, I can
do it.
But here, Jia is just moving code in a new file. I don't think this should block
his patchset from beeing included.
[Hemant] I thought of blocking this kind of moves, so that we get the
license complaint of DPDK faster 😊
Jia, shall keep the original copyrights and headers in this file (i.e. No
SPDX). You need to fix it along with rte_ring.h in near future.
Regards,
Hemant
Ok, I will
Besides ,I got the allowance from Kip Macy just now. He/She allowed dpdk
to license librte_ring.h as BSD-3.
My question:
>Would you mind allowing dpdk librte_ring.h to be licensed as BSD 3
instead of BSD 2?
His/her reply:
"I think that's fine. If you're using it be careful I think there's a
fix to memory barrier usage needed more relaxed memory models such as
ARM. I'll check reviews to see if it made it in or not."
--
Cheers,
Jia
