Merge "add license information to borrowed code" into R5.0

Juniper · Apr 17, 2018 · 2ce1cc6 · 2ce1cc6
2 parents 44d2e67 + 5700d6f
commit 2ce1cc6
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 0 deletions.
diff --git a/dpdk/qemu_uvhost.h b/dpdk/qemu_uvhost.h
@@ -5,6 +5,12 @@
  * Copyright (c) 2014 Juniper Networks, Inc. All rights reserved.
  */
 
+/*
+ * License: GPL-2.0+
+ * Copyright (c) 2013 Virtual Open Systems Sarl.
+ * https://www.qemu.org
+ */
+
 #ifndef __QEMU_UVHOST_H__
 #define __QEMU_UVHOST_H__
 

diff --git a/include/ulinux.h b/include/ulinux.h
@@ -3,6 +3,11 @@
 
 #include <time.h>
 
+/*
+ * License: GPL-2.0 WITH Linux-syscall-note
+ * https://github.com/torvalds/linux
+ * http://elixir.free-electrons.com/linux/v4.1.21/source/include/linux/timer.h
+ */
 struct list_head {
     struct list_head *next, *prev;
 };

diff --git a/include/vr_hash.h b/include/vr_hash.h
@@ -11,6 +11,7 @@
 
 /* vr_hash.h: Jenkins hash support.
  *
+ * License: Public Domain
  * Copyright (C) 2006. Bob Jenkins (bob_jenkins@burtleburtle.net)
  *
  * http://burtleburtle.net/bob/hash/

diff --git a/utils/vtest/vhost/src/uvhost.h b/utils/vtest/vhost/src/uvhost.h
@@ -5,6 +5,12 @@
  * Copyright (c) 2015 Juniper Networks, Inc. All rights reserved.
  */
 
+/*
+ * License: GPL-2.0+
+ * Copyright (c) 2013 Virtual Open Systems Sarl..
+ * https://www.qemu.org
+ */
+
 #ifndef QEMU_UVHOST_H
 #define QEMU_UVHOST_H
 

diff --git a/windows/vr_driver.c b/windows/vr_driver.c
@@ -318,6 +318,12 @@ FilterAttach(NDIS_HANDLE NdisFilterHandle,
 
     NT_ASSERT(DriverContext == (NDIS_HANDLE)VrDriverObject);
 
+    /*
+     * License: MS-PL
+     * Copyright (c) 2015 Microsoft
+     * https://github.com/Microsoft/Windows-driver-samples/blob/master/network/ndis/extension/base/SxBase.c
+     */
+
     // Accept Ethernet only
     if (AttachParameters->MiniportMediaType != NdisMedium802_3) {
         status = NDIS_STATUS_INVALID_PARAMETER;