diff options
author | Michael Brown <mcb30@ipxe.org> | 2015-03-02 13:29:46 +0000 |
---|---|---|
committer | Michael Brown <mcb30@ipxe.org> | 2015-03-02 16:35:29 +0000 |
commit | 2f020a8df3ad24d0d0bac9295c9cecb2ebba92f4 (patch) | |
tree | eb6f49f4b9358fe64fdf6fa9b1c1e044e2530bef /src/net | |
parent | 626ccf76eafeaf22144e36bb3822766b08b5443e (diff) | |
download | ipxe-2f020a8df3ad24d0d0bac9295c9cecb2ebba92f4.tar.gz |
[legal] Relicense files under GPL2_OR_LATER_OR_UBDL
These files cannot be automatically relicensed by util/relicense.pl
since they either contain unusual but trivial contributions (such as
the addition of __nonnull function attributes), or contain lines
dating back to the initial git revision (and so require manual
knowledge of the code's origin).
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/net')
-rw-r--r-- | src/net/aoe.c | 6 | ||||
-rw-r--r-- | src/net/arp.c | 6 | ||||
-rw-r--r-- | src/net/eth_slow.c | 6 | ||||
-rw-r--r-- | src/net/ethernet.c | 6 | ||||
-rw-r--r-- | src/net/ipv4.c | 6 | ||||
-rw-r--r-- | src/net/netdevice.c | 6 | ||||
-rw-r--r-- | src/net/tcp.c | 2 | ||||
-rw-r--r-- | src/net/tcp/httpcore.c | 6 | ||||
-rw-r--r-- | src/net/tcpip.c | 2 | ||||
-rw-r--r-- | src/net/udp.c | 2 | ||||
-rw-r--r-- | src/net/udp/dhcp.c | 6 | ||||
-rw-r--r-- | src/net/udp/dns.c | 6 | ||||
-rw-r--r-- | src/net/udp/tftp.c | 6 |
13 files changed, 53 insertions, 13 deletions
diff --git a/src/net/aoe.c b/src/net/aoe.c index a6d7b3e7..2da8655b 100644 --- a/src/net/aoe.c +++ b/src/net/aoe.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 <stddef.h> #include <string.h> diff --git a/src/net/arp.c b/src/net/arp.c index 261e681e..663dc002 100644 --- a/src/net/arp.c +++ b/src/net/arp.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/eth_slow.c b/src/net/eth_slow.c index db54b55a..049c26cb 100644 --- a/src/net/eth_slow.c +++ b/src/net/eth_slow.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 <stdlib.h> #include <string.h> diff --git a/src/net/ethernet.c b/src/net/ethernet.c index 03978c2a..1ca92a20 100644 --- a/src/net/ethernet.c +++ b/src/net/ethernet.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/ipv4.c b/src/net/ipv4.c index 4dae20d1..85ee5a68 100644 --- a/src/net/ipv4.c +++ b/src/net/ipv4.c @@ -16,6 +16,10 @@ * 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. */ #include <string.h> @@ -44,7 +48,7 @@ * */ -FILE_LICENCE ( GPL2_OR_LATER ); +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); /* Unique IP datagram identification number (high byte) */ static uint8_t next_ident_high = 0; diff --git a/src/net/netdevice.c b/src/net/netdevice.c index a55e6b7d..3c4b4cd0 100644 --- a/src/net/netdevice.c +++ b/src/net/netdevice.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/tcp.c b/src/net/tcp.c index 987cb63e..719c9936 100644 --- a/src/net/tcp.c +++ b/src/net/tcp.c @@ -26,7 +26,7 @@ * */ -FILE_LICENCE ( GPL2_OR_LATER ); +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); /** A TCP connection */ struct tcp_connection { diff --git a/src/net/tcp/httpcore.c b/src/net/tcp/httpcore.c index 1d1953e6..c20db704 100644 --- a/src/net/tcp/httpcore.c +++ b/src/net/tcp/httpcore.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 ); /** * @file diff --git a/src/net/tcpip.c b/src/net/tcpip.c index 4bcbe64b..261da582 100644 --- a/src/net/tcpip.c +++ b/src/net/tcpip.c @@ -17,7 +17,7 @@ * TCP/IP transport-network layer interface */ -FILE_LICENCE ( GPL2_OR_LATER ); +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); /** * Process a received TCP/IP packet diff --git a/src/net/udp.c b/src/net/udp.c index 76da67ec..0f7dfb24 100644 --- a/src/net/udp.c +++ b/src/net/udp.c @@ -17,7 +17,7 @@ * UDP protocol */ -FILE_LICENCE ( GPL2_OR_LATER ); +FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL ); /** * A UDP connection diff --git a/src/net/udp/dhcp.c b/src/net/udp/dhcp.c index 7a1a7c49..2e75ac81 100644 --- a/src/net/udp/dhcp.c +++ b/src/net/udp/dhcp.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 <stdlib.h> diff --git a/src/net/udp/dns.c b/src/net/udp/dns.c index fffe6e69..2d77477f 100644 --- a/src/net/udp/dns.c +++ b/src/net/udp/dns.c @@ -18,9 +18,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/udp/tftp.c b/src/net/udp/tftp.c index 375d55e6..953bcb46 100644 --- a/src/net/udp/tftp.c +++ b/src/net/udp/tftp.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> |