Skip to content

Commit

Permalink
more COPYING/LICENSE bs
Browse files Browse the repository at this point in the history
  • Loading branch information
eddietwo committed Feb 25, 2005
1 parent b7f70b3 commit 23403b8
Show file tree
Hide file tree
Showing 8 changed files with 473 additions and 47 deletions.
428 changes: 428 additions & 0 deletions COPYING
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions DISTFILES
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
AUTHORS
ChangeLog
ChangeLog.1
COPYING
DISTFILES
FAQ
INSTALL
Expand Down
1 change: 0 additions & 1 deletion LICENSE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.

20 changes: 11 additions & 9 deletions README
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,15 +145,17 @@ COPYRIGHT AND LICENSE
BSD-like license. See the 'LICENSE' file for details.

Portions of the Click software are derived from the Linux kernel, and
are thus distributed under the GNU General Public License, version 2, or,
at your discretion, any later version. The GNU General Public License is
available via the Web at <http://www.gnu.org/copyleft/gpl.html>, or in the
COPYING file in this directory. The Linux patches in etc/linux-*-patch are
definitely GPLed; the Linux driver in linuxmodule/ is GPLed.

Element code that you write using only Click's interfaces will
generally *not* be derived from the Linux kernel, so the 'LICENSE' file
will apply, not the GPL.
are thus distributed under the GNU General Public License, version 2. The
GNU General Public License is available via the Web at
<http://www.gnu.org/copyleft/gpl.html>, or in the COPYING file in this
directory. The GPL applies to the source files in drivers/e1000*, to the
files etc/linux-*-patch, linuxmodule/clickfs.cc, linuxmodule/proclikefs.c,
linuxmodule/sched.cc, and linuxmodule/skbmgr.cc, and possibly to some of
the files in elements/linuxmodule.

Typically, element code that uses only Click's interfaces will *not* be
derived from the Linux kernel, so the BSD-like 'LICENSE' will apply, not
the GPL.

BUGS, QUESTIONS, ETC.
---------------------
Expand Down
17 changes: 8 additions & 9 deletions linuxmodule/clickfs.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,14 @@
*
* Copyright (c) 2002-2003 International Computer Science Institute
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, subject to the conditions
* listed in the Click LICENSE file. These conditions include: you must
* preserve this copyright notice, and you cannot mention the copyright
* holders in advertising related to the Software without their permission.
* The Software is provided WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED. This
* notice is a summary of the Click LICENSE file; the license in that file is
* legally binding.
* This source code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 2.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*/

#include <click/config.h>
Expand Down
19 changes: 9 additions & 10 deletions linuxmodule/proclikefs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,14 @@
*
* Copyright (c) 2002-2003 International Computer Science Institute
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, subject to the conditions
* listed in the Click LICENSE file. These conditions include: you must
* preserve this copyright notice, and you cannot mention the copyright
* holders in advertising related to the Software without their permission.
* The Software is provided WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED. This
* notice is a summary of the Click LICENSE file; the license in that file is
* legally binding.
* This source code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 2.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*/

#undef CLICK_LINUXMODULE
Expand Down Expand Up @@ -378,5 +377,5 @@ cleanup_module(void)
}

#ifdef MODULE_LICENSE
MODULE_LICENSE("Dual BSD/GPL");
MODULE_LICENSE("GPL");
#endif
17 changes: 8 additions & 9 deletions linuxmodule/sched.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,14 @@
* Copyright (c) 1999-2000 Massachusetts Institute of Technology
* Copyright (c) 2002-2003 International Computer Science Institute
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, subject to the conditions
* listed in the Click LICENSE file. These conditions include: you must
* preserve this copyright notice, and you cannot mention the copyright
* holders in advertising related to the Software without their permission.
* The Software is provided WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED. This
* notice is a summary of the Click LICENSE file; the license in that file is
* legally binding.
* This source code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 2.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*/

#define CLICK_SCHED_DEBUG
Expand Down
17 changes: 8 additions & 9 deletions linuxmodule/skbmgr.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,14 @@
* Copyright (c) 2001 Massachusetts Institute of Technology
* Copyright (c) 2001 International Computer Science Institute
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, subject to the conditions
* listed in the Click LICENSE file. These conditions include: you must
* preserve this copyright notice, and you cannot mention the copyright
* holders in advertising related to the Software without their permission.
* The Software is provided WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED. This
* notice is a summary of the Click LICENSE file; the license in that file is
* legally binding.
* This source code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation, version 2.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*/

#include <click/config.h>
Expand Down

0 comments on commit 23403b8

Please sign in to comment.