Messages in this thread Patch in this message |  | | | Date | Wed, 18 Feb 2004 17:18:27 -0600 | | From | Matt Domsch <> | | Subject | Re: [PATCH 2.6.1 -- take two] Add CRC32C chksums to crypto and lib routines |
| |
> After seeking advice from Dell's lawyers, they recommend simply adding > the GPL license text to the top of the file and be done with it. > It's public domain, we're free to include (and relicense) it as we > wish. If someone else wants to use it in a non-GPL fashion, they'll > need to start from the original public domain submission, not this one > which clearly has been modified somewhat since we first received it, > with faster algorithms, creation of the table at compile time, etc.
Patch below applies to both 2.4.25 and 2.6.3, and replaces the public domain statement and non-warranty with the GPL, as is permitted by the code being in the public domain, and is done with legal advice.
Thanks, Matt
-- Matt Domsch Sr. Software Engineer, Lead Engineer Dell Linux Solutions linux.dell.com & www.dell.com/linux Linux on Dell mailing lists @ http://lists.us.dell.com
===== lib/crc32.c 1.11 vs edited ===== --- 1.11/lib/crc32.c Tue Feb 3 23:29:15 2004 +++ edited/lib/crc32.c Wed Feb 18 17:00:27 2004 @@ -1,6 +1,9 @@ -/* +/* * Oct 15, 2000 Matt Domsch <Matt_Domsch@dell.com> * Nicer crc32 functions/docs submitted by linux@horizon.com. Thanks! + * Code was from the public domain, copyright abandoned. Code was + * subsequently included in the kernel, thus was re-licensed under the + * GNU GPL v2. * * Oct 12, 2000 Matt Domsch <Matt_Domsch@dell.com> * Same crc32 function was used in 5 other places in the kernel. @@ -12,7 +15,9 @@ * drivers/net/smc9194.c uses seed ~0, doesn't xor with ~0. * fs/jffs2 uses seed 0, doesn't xor with ~0. * fs/partitions/efi.c uses seed ~0, xor's with ~0. - * + * + * This source code is licensed under the GNU General Public License, + * Version 2. See the file COPYING for more details. */ #include <linux/crc32.h> @@ -38,16 +43,10 @@ #define attribute(x) #endif -/* - * This code is in the public domain; copyright abandoned. - * Liability for non-performance of this code is limited to the amount - * you paid for it. Since it is distributed for free, your refund will - * be very very small. If it breaks, you get to keep both pieces. - */ MODULE_AUTHOR("Matt Domsch <Matt_Domsch@dell.com>"); MODULE_DESCRIPTION("Ethernet CRC32 calculations"); -MODULE_LICENSE("GPL and additional rights"); +MODULE_LICENSE("GPL"); #if CRC_LE_BITS == 1 /* - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
|  |