aboutsummaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorMichael Brown <mcb30@ipxe.org>2015-03-02 12:28:42 +0000
committerMichael Brown <mcb30@ipxe.org>2015-03-02 14:50:42 +0000
commit626ccf76eafeaf22144e36bb3822766b08b5443e (patch)
treef1a32bff79912a070106493e1ae5065b1d01d494 /src/net
parente24be567f47953d93338278bb8bdc8b1b2e748b5 (diff)
downloadipxe-626ccf76eafeaf22144e36bb3822766b08b5443e.zip
ipxe-626ccf76eafeaf22144e36bb3822766b08b5443e.tar.gz
ipxe-626ccf76eafeaf22144e36bb3822766b08b5443e.tar.bz2
[legal] Relicense files under GPL2_OR_LATER_OR_UBDL
Relicence files with kind permission from the following contributors: Alex Williamson <alex.williamson@redhat.com> Eduardo Habkost <ehabkost@redhat.com> Greg Jednaszewski <jednaszewski@gmail.com> H. Peter Anvin <hpa@zytor.com> Marin Hannache <git@mareo.fr> Robin Smidsrød <robin@smidsrod.no> Shao Miller <sha0.miller@gmail.com> Thomas Horsten <thomas@horsten.com> Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/net')
-rw-r--r--src/net/dhcpopts.c6
-rw-r--r--src/net/infiniband.c6
-rw-r--r--src/net/netdev_settings.c6
3 files changed, 15 insertions, 3 deletions
diff --git a/src/net/dhcpopts.c b/src/net/dhcpopts.c
index 8cd19cf..cdb632b 100644
--- a/src/net/dhcpopts.c
+++ b/src/net/dhcpopts.c
@@ -15,9 +15,13 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
+ *
+ * You can also choose to distribute this program under the terms of
+ * the Unmodified Binary Distribution Licence (as given in the file
+ * COPYING.UBDL), provided that you have satisfied its requirements.
*/
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
#include <stdint.h>
#include <stdlib.h>
diff --git a/src/net/infiniband.c b/src/net/infiniband.c
index 12d1d83..fcc8a63 100644
--- a/src/net/infiniband.c
+++ b/src/net/infiniband.c
@@ -15,9 +15,13 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
+ *
+ * You can also choose to distribute this program under the terms of
+ * the Unmodified Binary Distribution Licence (as given in the file
+ * COPYING.UBDL), provided that you have satisfied its requirements.
*/
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
#include <stdint.h>
#include <stdlib.h>
diff --git a/src/net/netdev_settings.c b/src/net/netdev_settings.c
index b3b2e68..677d5a9 100644
--- a/src/net/netdev_settings.c
+++ b/src/net/netdev_settings.c
@@ -15,9 +15,13 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
+ *
+ * You can also choose to distribute this program under the terms of
+ * the Unmodified Binary Distribution Licence (as given in the file
+ * COPYING.UBDL), provided that you have satisfied its requirements.
*/
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
#include <string.h>
#include <errno.h>