* [Kernel-janitors] [PATCH] drivers/video/fbcmap.c kmalloc audit
From: Leann Ogasawara @ 2004-01-27 21:37 UTC (permalink / raw)
To: kernel-janitors
Hi All,
Patch to audit kmalloc()'s and handle errors accordingly. Thanks,
Leann
diffed against 2.6.2-rc2
=== drivers/video/fbcmap.c 1.9 vs edited ==--- 1.9/drivers/video/fbcmap.c Mon Mar 31 13:51:12 2003
+++ edited/drivers/video/fbcmap.c Mon Jan 26 17:38:53 2004
@@ -98,14 +98,14 @@
if (!len)
return 0;
if (!(cmap->red = kmalloc(size, GFP_ATOMIC)))
- return -1;
+ goto err_red;
if (!(cmap->green = kmalloc(size, GFP_ATOMIC)))
- return -1;
+ goto err_green;
if (!(cmap->blue = kmalloc(size, GFP_ATOMIC)))
- return -1;
+ goto err_blue;
if (transp) {
if (!(cmap->transp = kmalloc(size, GFP_ATOMIC)))
- return -1;
+ goto err_transp;
} else
cmap->transp = NULL;
}
@@ -113,6 +113,17 @@
cmap->len = len;
fb_copy_cmap(fb_default_cmap(len), cmap, 0);
return 0;
+
+ err_transp:
+ kfree(cmap->blue);
+ err_blue:
+ kfree(cmap->green);
+ err_green:
+ kfree(cmap->red);
+ err_red:
+ cmap->red = cmap->green = cmap->blue = cmap->transp = NULL;
+ cmap->len = 0;
+ return -1;
}
/**
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply
* Re: [OT] Sco
From: Gene Heskett @ 2004-01-27 21:36 UTC (permalink / raw)
To: Linux Kernel
In-Reply-To: <20040127202642.GA7501@mark.mielke.cc>
On Tuesday 27 January 2004 15:26, Mark Mielke wrote:
>On Tue, Jan 27, 2004 at 12:25:45PM -0500, Wakko Warner wrote:
>> > Besides, DoS attacks against SCO will only be blamed on the
>> > Linux community. So the developer of that virus is either a
>> > complete idiot or is acting to intentionally hurt our image.
I agree with the latter interpretation. Somebody who wants to give
Darls unfounded rhetoric some traction in court next week.
>> If the former, then this is probably a windows person. After all,
>> the virus is for *windows* and not linux.
>
>Haha... you guys are thinking like sophisticated intellectuals.
>
>Most likely, it is some teenage wannabe who is just trying to
> convince themselves that they play a part in this drama called
> life. "Look how cool I am!" (Of course - in the less socially ept
> circles, teenagers can take the form of 40-year old geeks...
> hopefully nobody here... :-) )
>
>Cheers,
>mark
Or even a wannabe geek going on 70 :) And no, I didn't write it. And
I sure don't want to know enough about windows to be able to write a
worm, that would be against my religion. In my religion, windows is
the wrong answer.
--
Cheers, Gene
"There are four boxes to be used in defense of liberty: soap,
ballot, jury, and ammo. Please use in that order."
-Ed Howdershelt (Author)
99.22% setiathome rank, not too shabby for a WV hillbilly
Yahoo.com attornies please note, additions to this message
by Gene Heskett are:
Copyright 2004 by Maurice Eugene Heskett, all rights reserved.
^ permalink raw reply
* [ALSA - driver 0000005]: alsa-driver-1.0.2: unresolved symbols in snd.o
From: noreply @ 2004-01-27 21:37 UTC (permalink / raw)
To: alsa-devel
A BUGNOTE has been added to this bug.
======================================================================
http://bugtrack.alsa-project.org/alsa-bug/bug_view_advanced_page.php?bug_id=0000005
======================================================================
Reporter: ZlatkO
Handler: perex
======================================================================
Project: ALSA - driver
Bug ID: 5
Category: 0_compilation problem_!!!
Reproducibility: always
Severity: block
Priority: immediate
Status: assigned
Distribution: Slackware 8.1
Kernel Version: 2.4.24
======================================================================
Date Submitted: 01-27-2004 21:31 CET
Last Modified: 01-27-2004 22:37 CET
======================================================================
Summary: alsa-driver-1.0.2: unresolved symbols in snd.o
Description:
snd.o fails to load due to an unresolved symbol ("sound_class") on a
Slackware 8.1 system, kernel 2.4.24 (plain vanilla from kernel.org),
modutils-2.4.16.
There is no "sound_class" in the kernel's own
/usr/src/linux-2.4.24/drivers/sound/sound_core.c - am I supposed to
replace it with alsa-kernel/sound_core.c? This was not necessary in
previous ALSA versions.
======================================================================
----------------------------------------------------------------------
perex - 01-27-2004 22:08 CET
----------------------------------------------------------------------
I cannot reproduce this bug, but it might be possible that removing
of line 'extern struct class_simple *sound_class;' in
alsa-driver/alsa-kernel/core/sound.c solves this bug.
Can you confirm?
I've recreated new alsa-driver package with date:
Jan 27 22:02 alsa-driver-1.0.2.tar.bz2
----------------------------------------------------------------------
khali - 01-27-2004 22:18 CET
----------------------------------------------------------------------
Doesn't work for me. Even worse, alsa-driver doesn't compile anymore after
I commented the line out:
sound.c: In function `snd_register_device_R1f4c5f07':
sound.c:239: `sound_class' undeclared (first use in this function)
sound.c:239: (Each undeclared identifier is reported only once
sound.c:239: for each function it appears in.)
sound.c: In function `alsa_sound_init':
sound.c:376: `sound_class' undeclared (first use in this function)
sound.c: At top level:
sound.c:41: warning: `device_mode' defined but not used
make[1]: *** [sound.o] Error 1
make[1]: Leaving directory `/usr/src/alsa-driver-1.0.2/acore'
make: *** [compile] Error 1
----------------------------------------------------------------------
perex - 01-27-2004 22:37 CET
----------------------------------------------------------------------
Ok, can you add '#define sound_class NULL' after removing of suggested line
(on the same place)? Note that the rebuilded alsa-driver package has this
fix included.
Bug History
Date Modified Username Field Change
======================================================================
01-27-04 21:31 ZlatkO New Bug
01-27-04 22:08 perex Bugnote Added: 0000005
01-27-04 22:08 perex Assigned To => perex
01-27-04 22:08 perex Status new => assigned
01-27-04 22:08 perex Priority normal => immediate
01-27-04 22:15 perex Category CORE - control => 0_compilation problem_!!!
01-27-04 22:18 khali Bugnote Added: 0000007
01-27-04 22:37 perex Bugnote Added: 0000008
======================================================================
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
^ permalink raw reply
* Re: ip_conntrack CLOSE_WAIT issue.
From: Dirk Morris @ 2004-01-27 21:38 UTC (permalink / raw)
To: Dirk Morris; +Cc: netfilter-devel
In-Reply-To: <4016D6DE.4040801@metavize.com>
My apologies,
I believe this is related to an experimental patch that I am using, and
is not conntrack related.
Conntrack nevers sees the first FIN, which would explain this behavior.
-Dirk
Dirk Morris wrote:
> my conntrack table on machines are building up with tons of
> connections in the CLOSE_WAIT state.
> Because the timeout is so long, they stick around until the table
> fills up.
>
> Why are these connections not transitioning to the full closed state?
> tcpdump shows that the full Fin/Fin-Ack/Ack takes place at the end of
> these connections, but they still stick around.
>
>
> In the following example, timmy is running an echo server on port 7000.
>
>
> ~ # cat /proc/net/ip_conntrack| grep 7000 [dmorris
> @ timmy]
> <nothing>
>
> ~ # s tcpdump "host bebe" [dmorris @
> timmy]
> ...
> 13:10:15.436354 bebe.43035 > timmy.7000: . ack 10 win 5840
> <nop,nop,timestamp 164347449 1498713> (DF)
> 13:10:17.702593 bebe.43035 > timmy.7000: F 10:10(0) ack 10 win 5840
> <nop,nop,timestamp 164347675 1498713> (DF)
> 13:10:17.702841 timmy.7000 > bebe.43035: F 10:10(0) ack 11 win 5792
> <nop,nop,timestamp 1500980 164347675> (DF)
> 13:10:17.703086 bebe.43035 > timmy.7000: . ack 11 win 5840
> <nop,nop,timestamp 164347675 1500980> (DF)
>
> now on bebe I did:
>
> ~ # netcat timmy 7000
> [dmorris @ bebe]
> aoesutnh
> aoesutnh
>
> Ctrl-C
> ~#
>
> This causes the connection opening (not shown) and closing you see in
> the tcpdump above.
>
> But the connection never leaves the conntrack table.
>
> ~ # cat /proc/net/ip_conntrack| grep 7000 [dmorris
> @ timmy]
> tcp 6 257147 CLOSE_WAIT src=10.0.0.44 dst=10.0.0.187 sport=43035
> dport=7000 src=10.0.0.187 dst=10.0.0.44 sport=7000 dport=43035
> [ASSURED] use=1
>
>
> I realize I could just turn
> /proc/sys/net/ipv4/netfilter/ip_conntrack_tcp_timeout_close_wait, is
> that the fix or is this not supposed to happen?
> This happens on two similar machines, in both 2.4.18 and 2.6.0-test8
>
>
>
> info on timmy:
>
> ~
> #
> [dmorris @ timmy]
> ~ # uname
> -a
> [dmorris @ timmy]
> Linux timmy 2.6.0-test8 #4 SMP Tue Dec 16 15:55:23 PST 2003 i686 unknown
> ~ # ifconfig
> eth0
> [dmorris @ timmy]
> eth0 Link encap:Ethernet HWaddr 00:40:05:A0:20:07 inet
> addr:10.0.0.187 Bcast:10.0.0.255 Mask:255.255.255.0
> UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1
> RX packets:6487 errors:1 dropped:0 overruns:0 frame:0
> TX packets:5717 errors:24 dropped:0 overruns:0 carrier:24
> collisions:0 txqueuelen:1000
> RX bytes:793932 (775.3 KiB) TX bytes:1599858 (1.5 MiB)
> Interrupt:11 Base address:0xac00
>
> ~ # netstat
> -rn
> [dmorris @ timmy]
> Kernel IP routing table
> Destination Gateway Genmask Flags MSS Window
> irtt Iface
> 10.0.0.0 0.0.0.0 255.255.255.0 U 0 0
> 0 eth0
> 0.0.0.0 10.0.0.1 0.0.0.0 UG 0 0
> 0 eth0
> ~ # netstat | grep CLOSE_WAIT | wc
> -l [dmorris @
> timmy]
> 0
> ~ # cat /proc/net/ip_conntrack| grep CLOSE_WAIT | wc
> -l [dmorris @ timmy]
> 10
>
>
> Thanks,
> -Dirk
>
>
>
>
>
>
>
^ permalink raw reply
* Re: pmdisk working on ppc (WAS: Help port swsusp to ppc)
From: Benjamin Herrenschmidt @ 2004-01-27 21:40 UTC (permalink / raw)
To: Michael Schmitz
Cc: Michael Schmitz, Pavel Machek, Hugang, Patrick Mochel,
Nigel Cunningham, ncunningham, linuxppc-dev list
In-Reply-To: <Pine.LNX.4.44.0401271400530.5220-100000@zirkon.biophys.uni-duesseldorf.de>
> Battery requests might have been underway; pmud is running. If I read
> pmu_suspend() right, pending battery requests should result in pmu_suspend
> waiting for them to finish?
Normally yes... pmud isn't running at this point (all processes are frozen)
Ben.
** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/
^ permalink raw reply
* Docu:: Alsa Audio API:: A minimal capture program
From: Torsten Mohr @ 2004-01-27 21:40 UTC (permalink / raw)
To: alsa-devel
Hi,
i copied the "minimal capture program" from the
Alsa page -> Documentation -> Tutorial on using the
ALSA Audio API -> A minimal capture program.
I added "int rate = 44100" and changed the wrong
parameter "44100" in "snd_pcm_hw_params_set_rate_near"
to "&rate".
bash# gcc capture.c -lasound
bash# a.out default
But if i add a "sleep(1)" in the "for(i = 0; i < 10; i++)",
the whole program crashes.
I want to write a program where some chunk of
data is sampled from time to time, with some delay
inbetween. The behaviour above (with sleep(1))
is a good example for what i want to do.
Can anybody tell me what i need to change to make
the program work ok?
Thanks for any hints,
Torsten.
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
^ permalink raw reply
* [PATCH] netfilter cosmetic: add/correct copyright notices
From: Harald Welte @ 2004-01-27 21:42 UTC (permalink / raw)
To: David Miller; +Cc: Netfilter Development Mailinglist
[-- Attachment #1.1: Type: text/plain, Size: 557 bytes --]
Hi Dave!
The attached patch adds and/or corrects copyright notices and GPL
statements throughout the netfilter code.
It applies cleanly to 2.6.2-rc2.
Please apply, thanks.
--
- Harald Welte <laforge@netfilter.org> http://www.netfilter.org/
============================================================================
"Fragmentation is like classful addressing -- an interesting early
architectural error that shows how much experimentation was going
on while IP was being designed." -- Paul Vixie
[-- Attachment #1.2: linux-2.6.patch --]
[-- Type: text/plain, Size: 87624 bytes --]
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_conntrack_core.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_conntrack_core.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_conntrack_core.c 2003-12-18 05:35:25.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_conntrack_core.c 2004-01-19 08:04:46.136207776 -0500
@@ -2,8 +2,12 @@
but required by, the NAT layer; it can also be used by an iptables
extension. */
-/* (c) 1999 Paul `Rusty' Russell. Licenced under the GNU General
- * Public Licence.
+/* (C) 1999-2001 Paul `Rusty' Russell
+ * (C) 2002-2004 Netfilter Core Team <coreteam@netfilter.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*
* 23 Apr 2001: Harald Welte <laforge@gnumonks.org>
* - new API and handling of conntrack/nat helpers
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_conntrack_ftp.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_conntrack_ftp.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_conntrack_ftp.c 2003-12-18 05:39:12.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_conntrack_ftp.c 2004-01-19 08:04:56.932566480 -0500
@@ -1,4 +1,13 @@
/* FTP extension for IP connection tracking. */
+
+/* (C) 1999-2001 Paul `Rusty' Russell
+ * (C) 2002-2004 Netfilter Core Team <coreteam@netfilter.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
#include <linux/config.h>
#include <linux/module.h>
#include <linux/netfilter.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_conntrack_proto_generic.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_conntrack_proto_generic.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_conntrack_proto_generic.c 2003-12-18 05:37:07.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_conntrack_proto_generic.c 2004-01-19 08:06:15.186670048 -0500
@@ -1,3 +1,11 @@
+/* (C) 1999-2001 Paul `Rusty' Russell
+ * (C) 2002-2004 Netfilter Core Team <coreteam@netfilter.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
#include <linux/types.h>
#include <linux/sched.h>
#include <linux/timer.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_conntrack_proto_icmp.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_conntrack_proto_icmp.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_conntrack_proto_icmp.c 2003-12-18 05:35:37.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_conntrack_proto_icmp.c 2004-01-19 08:06:40.476825360 -0500
@@ -1,3 +1,11 @@
+/* (C) 1999-2001 Paul `Rusty' Russell
+ * (C) 2002-2004 Netfilter Core Team <coreteam@netfilter.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
#include <linux/types.h>
#include <linux/sched.h>
#include <linux/timer.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_conntrack_proto_tcp.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_conntrack_proto_tcp.c 2003-12-18 05:40:02.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_conntrack_proto_tcp.c 2004-01-19 08:07:10.016334672 -0500
@@ -1,3 +1,11 @@
+/* (C) 1999-2001 Paul `Rusty' Russell
+ * (C) 2002-2004 Netfilter Core Team <coreteam@netfilter.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
#include <linux/types.h>
#include <linux/sched.h>
#include <linux/timer.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_conntrack_proto_udp.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_conntrack_proto_udp.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_conntrack_proto_udp.c 2003-12-18 05:35:24.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_conntrack_proto_udp.c 2004-01-19 08:07:43.372263800 -0500
@@ -1,3 +1,11 @@
+/* (C) 1999-2001 Paul `Rusty' Russell
+ * (C) 2002-2004 Netfilter Core Team <coreteam@netfilter.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
#include <linux/types.h>
#include <linux/sched.h>
#include <linux/timer.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_conntrack_standalone.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_conntrack_standalone.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_conntrack_standalone.c 2003-12-18 05:37:39.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_conntrack_standalone.c 2004-01-19 08:08:22.153368176 -0500
@@ -4,8 +4,13 @@
These are not required by the compatibility layer.
*/
-/* (c) 1999 Paul `Rusty' Russell. Licenced under the GNU General
- Public Licence. */
+/* (C) 1999-2001 Paul `Rusty' Russell
+ * (C) 2002-2004 Netfilter Core Team <coreteam@netfilter.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
#include <linux/config.h>
#include <linux/types.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_conntrack_tftp.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_conntrack_tftp.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_conntrack_tftp.c 2003-12-18 05:37:02.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_conntrack_tftp.c 2004-01-19 08:09:35.904156352 -0500
@@ -1,5 +1,9 @@
-/*
- * Licensed under GNU GPL version 2 Copyright Magnus Boden <mb@ozaba.mine.nu>
+/* (C) 2001-2002 Magnus Boden <mb@ozaba.mine.nu>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
* Version: 0.0.7
*
* Thu 21 Mar 2002 Harald Welte <laforge@gnumonks.org>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_fw_compat.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_fw_compat.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_fw_compat.c 2003-12-18 05:37:27.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_fw_compat.c 2004-01-19 08:15:18.972002112 -0500
@@ -1,5 +1,14 @@
/* Compatibility framework for ipchains and ipfwadm support; designed
to look as much like the 2.2 infrastructure as possible. */
+
+/* (C) 1999-2001 Paul `Rusty' Russell
+ * (C) 2002-2004 Netfilter Core Team <coreteam@netfilter.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
struct notifier_block;
#include <linux/netfilter_ipv4.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_fw_compat_masq.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_fw_compat_masq.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_fw_compat_masq.c 2003-12-18 05:39:15.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_fw_compat_masq.c 2004-01-19 08:10:45.167626704 -0500
@@ -4,6 +4,15 @@
ports 61000:65095 (in 2.0 and 2.2 they get EADDRINUSE). Just DON'T
DO IT.
*/
+
+/* (C) 1999-2001 Paul `Rusty' Russell
+ * (C) 2002-2004 Netfilter Core Team <coreteam@netfilter.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
#include <linux/skbuff.h>
#include <linux/in.h>
#include <linux/ip.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_fw_compat_redir.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_fw_compat_redir.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_fw_compat_redir.c 2003-12-18 05:39:01.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_fw_compat_redir.c 2004-01-19 08:11:09.512925656 -0500
@@ -7,6 +7,15 @@
FIXME: Timing is overly simplistic. If anyone complains, make it
use conntrack.
*/
+
+/* (C) 1999-2001 Paul `Rusty' Russell
+ * (C) 2002-2004 Netfilter Core Team <coreteam@netfilter.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
#include <linux/config.h>
#include <linux/netfilter.h>
#include <linux/ip.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_nat_core.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_nat_core.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_nat_core.c 2003-12-18 05:36:23.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_nat_core.c 2004-01-19 08:12:02.036940792 -0500
@@ -1,7 +1,13 @@
/* NAT for netfilter; shared with compatibility layer. */
-/* (c) 1999 Paul `Rusty' Russell. Licenced under the GNU General
- Public Licence. */
+/* (C) 1999-2001 Paul `Rusty' Russell
+ * (C) 2002-2004 Netfilter Core Team <coreteam@netfilter.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
#include <linux/module.h>
#include <linux/types.h>
#include <linux/timer.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_nat_ftp.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_nat_ftp.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_nat_ftp.c 2003-12-18 05:38:40.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_nat_ftp.c 2004-01-19 08:12:26.995146568 -0500
@@ -1,4 +1,13 @@
/* FTP extension for TCP NAT alteration. */
+
+/* (C) 1999-2001 Paul `Rusty' Russell
+ * (C) 2002-2004 Netfilter Core Team <coreteam@netfilter.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
#include <linux/module.h>
#include <linux/netfilter_ipv4.h>
#include <linux/ip.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_nat_helper.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_nat_helper.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_nat_helper.c 2003-12-18 05:36:25.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_nat_helper.c 2004-01-19 08:13:43.611499112 -0500
@@ -1,8 +1,11 @@
-/* ip_nat_mangle.c - generic support functions for NAT helpers
+/* ip_nat_helper.c - generic support functions for NAT helpers
*
- * (C) 2000-2002 by Harald Welte <laforge@gnumonks.org>
+ * (C) 2000-2002 Harald Welte <laforge@netfilter.org>
+ * (C) 2003-2004 Netfilter Core Team <coreteam@netfilter.org>
*
- * distributed under the terms of GNU GPL
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*
* 14 Jan 2002 Harald Welte <laforge@gnumonks.org>:
* - add support for SACK adjustment
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_nat_proto_icmp.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_nat_proto_icmp.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_nat_proto_icmp.c 2003-12-18 05:37:00.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_nat_proto_icmp.c 2004-01-19 08:14:15.562641800 -0500
@@ -1,3 +1,11 @@
+/* (C) 1999-2001 Paul `Rusty' Russell
+ * (C) 2002-2004 Netfilter Core Team <coreteam@netfilter.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
#include <linux/types.h>
#include <linux/init.h>
#include <linux/netfilter.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_nat_proto_tcp.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_nat_proto_tcp.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_nat_proto_tcp.c 2003-12-18 05:35:37.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_nat_proto_tcp.c 2004-01-19 08:14:45.989016288 -0500
@@ -1,3 +1,11 @@
+/* (C) 1999-2001 Paul `Rusty' Russell
+ * (C) 2002-2004 Netfilter Core Team <coreteam@netfilter.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
#include <linux/types.h>
#include <linux/init.h>
#include <linux/netfilter.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_nat_proto_udp.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_nat_proto_udp.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_nat_proto_udp.c 2003-12-18 05:36:28.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_nat_proto_udp.c 2004-01-19 08:15:12.266021576 -0500
@@ -1,3 +1,11 @@
+/* (C) 1999-2001 Paul `Rusty' Russell
+ * (C) 2002-2004 Netfilter Core Team <coreteam@netfilter.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
#include <linux/types.h>
#include <linux/init.h>
#include <linux/netfilter.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_nat_proto_unknown.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_nat_proto_unknown.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_nat_proto_unknown.c 2003-12-18 05:37:55.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_nat_proto_unknown.c 2004-01-19 08:15:43.180321888 -0500
@@ -2,6 +2,14 @@
* don't understand. It's returned by ip_ct_find_proto().
*/
+/* (C) 1999-2001 Paul `Rusty' Russell
+ * (C) 2002-2004 Netfilter Core Team <coreteam@netfilter.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
#include <linux/types.h>
#include <linux/init.h>
#include <linux/netfilter.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_nat_rule.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_nat_rule.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_nat_rule.c 2003-12-18 05:37:31.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_nat_rule.c 2004-01-19 08:16:30.050196584 -0500
@@ -1,3 +1,11 @@
+/* (C) 1999-2001 Paul `Rusty' Russell
+ * (C) 2002-2004 Netfilter Core Team <coreteam@netfilter.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
/* Everything about the rules for NAT. */
#include <linux/types.h>
#include <linux/ip.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_nat_standalone.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_nat_standalone.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_nat_standalone.c 2003-12-18 05:39:12.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_nat_standalone.c 2004-01-19 08:17:15.022359776 -0500
@@ -4,9 +4,15 @@
These are not required by the compatibility layer.
*/
-/* (c) 1999 Paul `Rusty' Russell. Licenced under the GNU General
- * Public Licence.
+/* (C) 1999-2001 Paul `Rusty' Russell
+ * (C) 2002-2004 Netfilter Core Team <coreteam@netfilter.org>
*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+/*
* 23 Apr 2001: Harald Welte <laforge@gnumonks.org>
* - new API and handling of conntrack/nat helpers
* - now capable of multiple expectations for one master
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_nat_tftp.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_nat_tftp.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_nat_tftp.c 2003-12-18 05:36:57.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_nat_tftp.c 2004-01-19 08:17:45.106786248 -0500
@@ -1,5 +1,9 @@
-/*
- * Licensed under GNU GPL version 2 Copyright Magnus Boden <mb@ozaba.mine.nu>
+/* (C) 2001-2002 Magnus Boden <mb@ozaba.mine.nu>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
* Version: 0.0.7
*
* Thu 21 Mar 2002 Harald Welte <laforge@gnumonks.org>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_queue.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_queue.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_queue.c 2003-12-18 05:40:19.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_queue.c 2004-01-19 08:19:35.814956048 -0500
@@ -2,7 +2,11 @@
* This is a module which is used for queueing IPv4 packets and
* communicating with userspace via netlink.
*
- * (C) 2000-2002 James Morris, this code is GPL.
+ * (C) 2000-2002 James Morris <jmorris@intercode.com.au>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*
* 2000-03-27: Simplified code (thanks to Andi Kleen for clues).
* 2000-05-20: Fixed notifier problems (following Miguel Freitas' report).
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_tables.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_tables.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ip_tables.c 2003-12-18 05:36:41.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ip_tables.c 2004-01-19 08:20:21.807964048 -0500
@@ -2,7 +2,11 @@
* Packet matching code.
*
* Copyright (C) 1999 Paul `Rusty' Russell & Michael J. Neuling
- * Copyright (C) 2009-2002 Netfilter core team <coreteam@netfilter.org>
+ * Copyright (C) 2000-2004 Netfilter Core Team <coreteam@netfilter.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*
* 19 Jan 2002 Harald Welte <laforge@gnumonks.org>
* - increase module usage count as soon as we have rules inside
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_CLASSIFY.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_CLASSIFY.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_CLASSIFY.c 2003-12-18 05:35:26.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_CLASSIFY.c 2004-01-19 08:22:12.977063776 -0500
@@ -3,6 +3,13 @@
* of an skb for qdisc classification.
*/
+/* (C) 2001-2002 Patrick McHardy <kaber@trash.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
#include <linux/module.h>
#include <linux/skbuff.h>
#include <linux/ip.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_DSCP.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_DSCP.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_DSCP.c 2003-12-18 05:39:52.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_DSCP.c 2004-01-19 08:23:37.442223120 -0500
@@ -1,8 +1,11 @@
/* iptables module for setting the IPv4 DSCP field, Version 1.8
*
- * (C) 2002 by Harald Welte <laforge@gnumonks.org>
+ * (C) 2002 by Harald Welte <laforge@netfilter.org>
* based on ipt_FTOS.c (C) 2000 by Matthew G. Marsh <mgm@paktronix.com>
- * This software is distributed under GNU GPL v2, 1991
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*
* See RFC2474 for a description of the DSCP field within the IP Header.
*
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_ECN.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_ECN.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_ECN.c 2003-12-18 05:40:00.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_ECN.c 2004-01-19 08:24:33.795656096 -0500
@@ -1,9 +1,11 @@
/* iptables module for the IPv4 and TCP ECN bits, Version 1.5
*
- * (C) 2002 by Harald Welte <laforge@gnumonks.org>
- *
- * This software is distributed under GNU GPL v2, 1991
+ * (C) 2002 by Harald Welte <laforge@netfilter.org>
*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
* ipt_ECN.c,v 1.5 2002/08/18 19:36:51 laforge Exp
*/
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_LOG.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_LOG.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_LOG.c 2003-12-18 05:39:26.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_LOG.c 2004-01-19 08:25:01.721410736 -0500
@@ -1,6 +1,15 @@
/*
* This is a module which is used for logging packets.
*/
+
+/* (C) 1999-2001 Paul `Rusty' Russell
+ * (C) 2002-2004 Netfilter Core Team <coreteam@netfilter.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
#include <linux/module.h>
#include <linux/spinlock.h>
#include <linux/skbuff.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_MARK.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_MARK.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_MARK.c 2003-12-18 05:38:10.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_MARK.c 2004-01-19 08:25:41.876306264 -0500
@@ -1,4 +1,12 @@
/* This is a module which is used for setting the NFMARK field of an skb. */
+
+/* (C) 1999-2001 Marc Boucher <marc@mbsi.ca>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
#include <linux/module.h>
#include <linux/skbuff.h>
#include <linux/ip.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_MASQUERADE.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_MASQUERADE.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_MASQUERADE.c 2003-12-18 05:38:29.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_MASQUERADE.c 2004-01-19 08:26:01.530318400 -0500
@@ -1,5 +1,14 @@
/* Masquerade. Simple mapping which alters range to a local IP address
(depending on route). */
+
+/* (C) 1999-2001 Paul `Rusty' Russell
+ * (C) 2002-2004 Netfilter Core Team <coreteam@netfilter.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
#include <linux/config.h>
#include <linux/types.h>
#include <linux/ip.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_NETMAP.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_NETMAP.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_NETMAP.c 2003-12-18 05:37:53.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_NETMAP.c 2004-01-19 08:27:32.730453872 -0500
@@ -1,9 +1,14 @@
/* NETMAP - static NAT mapping of IP network addresses (1:1).
- The mapping can be applied to source (POSTROUTING),
- destination (PREROUTING), or both (with separate rules).
-
- Author: Svenning Soerensen <svenning@post5.tele.dk>
-*/
+ * The mapping can be applied to source (POSTROUTING),
+ * destination (PREROUTING), or both (with separate rules).
+ */
+
+/* (C) 2000-2001 Svenning Soerensen <svenning@post5.tele.dk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
#include <linux/config.h>
#include <linux/ip.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_REDIRECT.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_REDIRECT.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_REDIRECT.c 2003-12-18 05:37:03.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_REDIRECT.c 2004-01-19 08:28:13.712223696 -0500
@@ -1,4 +1,12 @@
/* Redirect. Simple mapping which alters dst to a local IP address. */
+/* (C) 1999-2001 Paul `Rusty' Russell
+ * (C) 2002-2004 Netfilter Core Team <coreteam@netfilter.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
#include <linux/types.h>
#include <linux/ip.h>
#include <linux/timer.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_REJECT.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_REJECT.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_REJECT.c 2003-12-18 05:39:20.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_REJECT.c 2004-01-19 08:28:50.149684360 -0500
@@ -3,6 +3,15 @@
* Added support for customized reject packets (Jozsef Kadlecsik).
* Added support for ICMP type-3-code-13 (Maciej Soltysiak). [RFC 1812]
*/
+
+/* (C) 1999-2001 Paul `Rusty' Russell
+ * (C) 2002-2004 Netfilter Core Team <coreteam@netfilter.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
#include <linux/config.h>
#include <linux/module.h>
#include <linux/skbuff.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_SAME.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_SAME.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_SAME.c 2003-12-18 05:38:39.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_SAME.c 2004-01-19 08:30:22.195691240 -0500
@@ -1,7 +1,12 @@
/* Same. Just like SNAT, only try to make the connections
* between client A and server B always have the same source ip.
*
- * (C) 2000 Rusty Russell. GPL.
+ * (C) 2000 Paul `Rusty' Russell
+ * (C) 2001 Martin Josefsson
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*
* 010320 Martin Josefsson <gandalf@wlug.westbo.se>
* * copied ipt_BALANCE.c to ipt_SAME.c and changed a few things.
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_TCPMSS.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_TCPMSS.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_TCPMSS.c 2003-12-18 05:37:54.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_TCPMSS.c 2004-01-19 08:31:11.572184872 -0500
@@ -1,8 +1,13 @@
/*
* This is a module which is used for setting the MSS option in TCP packets.
*
- * Copyright (c) 2000 Marc Boucher
+ * Copyright (C) 2000 Marc Boucher <marc@mbsi.ca>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*/
+
#include <linux/module.h>
#include <linux/skbuff.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_TOS.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_TOS.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_TOS.c 2003-12-18 05:35:49.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_TOS.c 2004-01-19 08:32:18.368030360 -0500
@@ -1,4 +1,13 @@
/* This is a module which is used for setting the TOS field of a packet. */
+
+/* (C) 1999-2001 Paul `Rusty' Russell
+ * (C) 2002-2004 Netfilter Core Team <coreteam@netfilter.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
#include <linux/module.h>
#include <linux/skbuff.h>
#include <linux/ip.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_ULOG.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_ULOG.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_ULOG.c 2003-12-18 05:37:07.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_ULOG.c 2004-01-19 08:33:00.233665816 -0500
@@ -1,7 +1,7 @@
/*
* netfilter module for userspace packet logging daemons
*
- * (C) 2000-2002 by Harald Welte <laforge@gnumonks.org>
+ * (C) 2000-2002 by Harald Welte <laforge@netfilter.org>
*
* 2000/09/22 ulog-cprange feature added
* 2001/01/04 in-kernel queue as proposed by Sebastian Zander
@@ -14,7 +14,12 @@
* 2002/08/29 fix shifted/unshifted nlgroup bug -HW
* 2002/10/30 fix uninitialized mac_len field - <Anders K. Pedersen>
*
- * Released under the terms of the GPL
+ * (C) 1999-2001 Paul `Rusty' Russell
+ * (C) 2002-2004 Netfilter Core Team <coreteam@netfilter.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*
* This module accepts two parameters:
*
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_ah.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_ah.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_ah.c 2003-12-18 05:38:32.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_ah.c 2004-01-19 08:33:42.075304920 -0500
@@ -1,4 +1,11 @@
/* Kernel module to match AH parameters. */
+/* (C) 1999-2000 Yon Uriarte <yon@astaro.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
#include <linux/module.h>
#include <linux/skbuff.h>
#include <linux/ip.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_conntrack.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_conntrack.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_conntrack.c 2003-12-18 05:39:45.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_conntrack.c 2004-01-19 08:34:20.240502928 -0500
@@ -1,7 +1,13 @@
/* Kernel module to match connection tracking information.
* Superset of Rusty's minimalistic state match.
- * GPL (C) 2001 Marc Boucher (marc@mbsi.ca).
+ *
+ * (C) 2001 Marc Boucher (marc@mbsi.ca).
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*/
+
#include <linux/module.h>
#include <linux/skbuff.h>
#include <linux/netfilter_ipv4/ip_conntrack.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_dscp.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_dscp.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_dscp.c 2003-12-18 05:38:55.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_dscp.c 2004-01-19 08:35:00.429393288 -0500
@@ -2,9 +2,11 @@
*
* ipt_dscp.c,v 1.3 2002/08/05 19:00:21 laforge Exp
*
- * (C) 2002 by Harald Welte <laforge@gnumonks.org>
+ * (C) 2002 by Harald Welte <laforge@netfilter.org>
*
- * This software is distributed under the terms GNU GPL
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*/
#include <linux/module.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_ecn.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_ecn.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_ecn.c 2003-12-18 05:37:45.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_ecn.c 2004-01-19 08:35:28.478129232 -0500
@@ -4,7 +4,9 @@
*
* (C) 2002 by Harald Welte <laforge@gnumonks.org>
*
- * This software is distributed under the terms GNU GPL v2
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*/
#include <linux/module.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_esp.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_esp.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_esp.c 2003-12-18 05:37:54.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_esp.c 2004-01-19 08:35:46.369409344 -0500
@@ -1,4 +1,12 @@
/* Kernel module to match ESP parameters. */
+
+/* (C) 1999-2000 Yon Uriarte <yon@astaro.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
#include <linux/module.h>
#include <linux/skbuff.h>
#include <linux/ip.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_helper.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_helper.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_helper.c 2003-12-18 05:39:06.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_helper.c 2004-01-19 08:36:35.444948728 -0500
@@ -1,12 +1,15 @@
+/* iptables module to match on related connections */
/*
- * iptables module to match on related connections
- * (c) 2001 Martin Josefsson <gandalf@wlug.westbo.se>
+ * (C) 2001 Martin Josefsson <gandalf@wlug.westbo.se>
*
- * Released under the terms of GNU GPLv2.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*
* 19 Mar 2002 Harald Welte <laforge@gnumonks.org>:
* - Port to newnat infrastructure
*/
+
#include <linux/module.h>
#include <linux/skbuff.h>
#include <linux/netfilter.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_iprange.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_iprange.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_iprange.c 2003-12-18 05:37:53.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_iprange.c 2004-01-19 08:37:18.233443888 -0500
@@ -1,9 +1,11 @@
/*
* iptables module to match IP address ranges
- * (c) 2003 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
*
- * Released under the terms of GNU GPLv2.
+ * (C) 2003 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*/
#include <linux/module.h>
#include <linux/skbuff.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_length.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_length.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_length.c 2003-12-18 05:39:08.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_length.c 2004-01-19 08:37:49.141745112 -0500
@@ -1,4 +1,11 @@
/* Kernel module to match packet length. */
+/* (C) 1999-2001 James Morris <jmorros@intercode.com.au>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
#include <linux/module.h>
#include <linux/skbuff.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_limit.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_limit.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_limit.c 2003-12-18 05:35:49.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_limit.c 2004-01-19 08:39:05.373156176 -0500
@@ -1,12 +1,18 @@
/* Kernel module to control the rate
*
- * Jérôme de Vivie <devivie@info.enserb.u-bordeaux.fr>
- * Hervé Eychenne <eychenne@info.enserb.u-bordeaux.fr>
- *
* 2 September 1999: Changed from the target RATE to the match
* `limit', removed logging. Did I mention that
* Alexey is a fucking genius?
* Rusty Russell (rusty@rustcorp.com.au). */
+
+/* (C) 1999 Jérôme de Vivie <devivie@info.enserb.u-bordeaux.fr>
+ * (C) 1999 Hervé Eychenne <eychenne@info.enserb.u-bordeaux.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
#include <linux/module.h>
#include <linux/skbuff.h>
#include <linux/spinlock.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_mac.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_mac.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_mac.c 2003-12-18 05:35:59.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_mac.c 2004-01-19 08:39:26.554936056 -0500
@@ -1,4 +1,13 @@
/* Kernel module to match MAC address parameters. */
+
+/* (C) 1999-2001 Paul `Rusty' Russell
+ * (C) 2002-2004 Netfilter Core Team <coreteam@netfilter.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
#include <linux/module.h>
#include <linux/skbuff.h>
#include <linux/if_ether.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_mark.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_mark.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_mark.c 2003-12-18 05:40:36.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_mark.c 2004-01-19 08:39:48.030671248 -0500
@@ -1,4 +1,12 @@
/* Kernel module to match NFMARK values. */
+
+/* (C) 1999-2001 Marc Boucher <marc@mbsi.ca>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
#include <linux/module.h>
#include <linux/skbuff.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_multiport.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_multiport.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_multiport.c 2003-12-18 05:36:27.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_multiport.c 2004-01-19 08:40:04.685139384 -0500
@@ -1,5 +1,14 @@
/* Kernel module to match one of a list of TCP/UDP ports: ports are in
the same place so we can treat them as equal. */
+
+/* (C) 1999-2001 Paul `Rusty' Russell
+ * (C) 2002-2004 Netfilter Core Team <coreteam@netfilter.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
#include <linux/module.h>
#include <linux/types.h>
#include <linux/udp.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_owner.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_owner.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_owner.c 2003-12-18 05:39:49.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_owner.c 2004-01-19 08:40:32.248949048 -0500
@@ -1,8 +1,13 @@
/* Kernel module to match various things tied to sockets associated with
- locally generated outgoing packets.
+ locally generated outgoing packets. */
- Copyright (C) 2000 Marc Boucher
+/* (C) 2000 Marc Boucher <marc@mbsi.ca>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*/
+
#include <linux/module.h>
#include <linux/skbuff.h>
#include <linux/file.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_physdev.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_physdev.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_physdev.c 2003-12-18 05:36:53.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_physdev.c 2004-01-19 08:41:12.689801104 -0500
@@ -1,5 +1,13 @@
/* Kernel module to match the bridge port in and
* out device for IP packets coming into contact with a bridge. */
+
+/* (C) 2001-2003 Bart De Schuymer <bdschuym@pandora.be>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
#include <linux/module.h>
#include <linux/skbuff.h>
#include <linux/netfilter_ipv4/ipt_physdev.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_pkttype.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_pkttype.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_pkttype.c 2003-12-18 05:40:38.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_pkttype.c 2004-01-19 08:43:05.517648664 -0500
@@ -1,3 +1,10 @@
+/* (C) 1999-2001 Michal Ludvig <michal@logix.cz>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
#include <linux/module.h>
#include <linux/skbuff.h>
#include <linux/if_ether.h>
@@ -7,6 +14,8 @@
#include <linux/netfilter_ipv4/ip_tables.h>
MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Michal Ludvig <michal@logix.cz>");
+MODULE_DESCRIPTION("IP tables match to match on linklayer packet type");
static int match(const struct sk_buff *skb,
const struct net_device *in,
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_state.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_state.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_state.c 2003-12-18 05:40:10.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_state.c 2004-01-19 08:43:51.525654384 -0500
@@ -1,6 +1,13 @@
-/* Kernel module to match connection tracking information.
- * GPL (C) 1999 Rusty Russell (rusty@rustcorp.com.au).
+/* Kernel module to match connection tracking information. */
+
+/* (C) 1999-2001 Paul `Rusty' Russell
+ * (C) 2002-2004 Netfilter Core Team <coreteam@netfilter.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*/
+
#include <linux/module.h>
#include <linux/skbuff.h>
#include <linux/netfilter_ipv4/ip_conntrack.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_tcpmss.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_tcpmss.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_tcpmss.c 2003-12-18 05:36:03.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_tcpmss.c 2004-01-19 08:44:22.331971112 -0500
@@ -1,4 +1,12 @@
/* Kernel module to match TCP MSS values. */
+
+/* Copyright (C) 2000 Marc Boucher <marc@mbsi.ca>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
#include <linux/module.h>
#include <linux/skbuff.h>
#include <net/tcp.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_tos.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_tos.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_tos.c 2003-12-18 05:39:52.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_tos.c 2004-01-19 08:44:45.089511440 -0500
@@ -1,4 +1,13 @@
/* Kernel module to match TOS values. */
+
+/* (C) 1999-2001 Paul `Rusty' Russell
+ * (C) 2002-2004 Netfilter Core Team <coreteam@netfilter.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
#include <linux/module.h>
#include <linux/skbuff.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_ttl.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_ttl.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/ipt_ttl.c 2003-12-18 05:40:09.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/ipt_ttl.c 2004-01-19 08:45:26.319243568 -0500
@@ -2,9 +2,11 @@
*
* ipt_ttl.c,v 1.5 2000/11/13 11:16:08 laforge Exp
*
- * (C) 2000,2001 by Harald Welte <laforge@gnumonks.org>
+ * (C) 2000,2001 by Harald Welte <laforge@netfilter.org>
*
- * This software is distributed under the terms GNU GPL
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*/
#include <linux/module.h>
@@ -13,7 +15,7 @@
#include <linux/netfilter_ipv4/ipt_ttl.h>
#include <linux/netfilter_ipv4/ip_tables.h>
-MODULE_AUTHOR("Harald Welte <laforge@gnumonks.org>");
+MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>");
MODULE_DESCRIPTION("IP tables TTL matching module");
MODULE_LICENSE("GPL");
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/iptable_filter.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/iptable_filter.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/iptable_filter.c 2003-12-18 05:37:23.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/iptable_filter.c 2004-01-19 08:45:53.856057336 -0500
@@ -2,7 +2,14 @@
* This is the 1999 rewrite of IP Firewalling, aiming for kernel 2.3.x.
*
* Copyright (C) 1999 Paul `Rusty' Russell & Michael J. Neuling
+ * Copyright (C) 2000-2004 Netfilter Core Team <coreteam@netfilter.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
*/
+
#include <linux/module.h>
#include <linux/netfilter_ipv4/ip_tables.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/iptable_mangle.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/iptable_mangle.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv4/netfilter/iptable_mangle.c 2003-12-18 05:39:26.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv4/netfilter/iptable_mangle.c 2004-01-19 08:46:14.815870960 -0500
@@ -2,6 +2,11 @@
* This is the 1999 rewrite of IP Firewalling, aiming for kernel 2.3.x.
*
* Copyright (C) 1999 Paul `Rusty' Russell & Michael J. Neuling
+ * Copyright (C) 2000-2004 Netfilter Core Team <coreteam@netfilter.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*
* Extended to all five netfilter hooks by Brad Chapman & Harald Welte
*/
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv6/netfilter/ip6_queue.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv6/netfilter/ip6_queue.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv6/netfilter/ip6_queue.c 2003-12-18 05:36:51.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv6/netfilter/ip6_queue.c 2004-01-19 08:47:59.291988176 -0500
@@ -8,6 +8,10 @@
* Universidad Politecnica de Alcala de Henares - Alcala de H. (Madrid) - Spain
* email: fanton@it.uc3m.es
*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
* 2001-11-06: First try. Working with ip_queue.c for IPv4 and trying
* to adapt it to IPv6
* HEAVILY based in ipqueue.c by James Morris. It's just
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv6/netfilter/ip6_tables.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv6/netfilter/ip6_tables.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv6/netfilter/ip6_tables.c 2003-12-18 05:39:27.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv6/netfilter/ip6_tables.c 2004-01-19 08:48:32.167990264 -0500
@@ -4,6 +4,10 @@
* Copyright (C) 1999 Paul `Rusty' Russell & Michael J. Neuling
* Copyright (C) 2000-2002 Netfilter core team <coreteam@netfilter.org>
*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
* 19 Jan 2002 Harald Welte <laforge@gnumonks.org>
* - increase module usage count as soon as we have rules inside
* a table
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv6/netfilter/ip6t_LOG.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv6/netfilter/ip6t_LOG.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv6/netfilter/ip6t_LOG.c 2003-12-18 05:36:57.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv6/netfilter/ip6t_LOG.c 2004-01-19 08:49:08.728432232 -0500
@@ -1,6 +1,15 @@
/*
* This is a module which is used for logging packets.
*/
+
+/* (C) 2001 Jan Rekorajski <baggins@pld.org.pl>
+ * (C) 2002-2004 Netfilter Core Team <coreteam@netfilter.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
#include <linux/module.h>
#include <linux/skbuff.h>
#include <linux/ip.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv6/netfilter/ip6t_MARK.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv6/netfilter/ip6t_MARK.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv6/netfilter/ip6t_MARK.c 2003-12-18 05:39:45.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv6/netfilter/ip6t_MARK.c 2004-01-19 08:49:32.041888048 -0500
@@ -1,4 +1,12 @@
/* This is a module which is used for setting the NFMARK field of an skb. */
+
+/* (C) 1999-2001 Marc Boucher <marc@mbsi.ca>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
#include <linux/module.h>
#include <linux/skbuff.h>
#include <linux/ip.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv6/netfilter/ip6t_ah.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv6/netfilter/ip6t_ah.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv6/netfilter/ip6t_ah.c 2003-12-18 05:36:09.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv6/netfilter/ip6t_ah.c 2004-01-19 08:50:43.280058200 -0500
@@ -1,4 +1,12 @@
/* Kernel module to match AH parameters. */
+
+/* (C) 2001-2002 Andras Kis-Szabo <kisza@sch.bme.hu>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
#include <linux/module.h>
#include <linux/skbuff.h>
#include <linux/ipv6.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv6/netfilter/ip6t_dst.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv6/netfilter/ip6t_dst.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv6/netfilter/ip6t_dst.c 2003-12-18 05:35:47.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv6/netfilter/ip6t_dst.c 2004-01-19 08:50:37.236976888 -0500
@@ -1,4 +1,13 @@
/* Kernel module to match Hop-by-Hop and Destination parameters. */
+
+/* (C) 2001-2002 Andras Kis-Szabo <kisza@sch.bme.hu>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+
#include <linux/module.h>
#include <linux/skbuff.h>
#include <linux/ipv6.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv6/netfilter/ip6t_esp.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv6/netfilter/ip6t_esp.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv6/netfilter/ip6t_esp.c 2003-12-18 05:38:27.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv6/netfilter/ip6t_esp.c 2004-01-19 08:50:57.887837480 -0500
@@ -1,4 +1,12 @@
/* Kernel module to match ESP parameters. */
+/* (C) 2001-2002 Andras Kis-Szabo <kisza@sch.bme.hu>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+
#include <linux/module.h>
#include <linux/skbuff.h>
#include <linux/ipv6.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv6/netfilter/ip6t_eui64.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv6/netfilter/ip6t_eui64.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv6/netfilter/ip6t_eui64.c 2003-12-18 05:35:38.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv6/netfilter/ip6t_eui64.c 2004-01-19 08:51:18.853650192 -0500
@@ -1,4 +1,12 @@
/* Kernel module to match EUI64 address parameters. */
+
+/* (C) 2001-2002 Andras Kis-Szabo <kisza@sch.bme.hu>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
#include <linux/module.h>
#include <linux/skbuff.h>
#include <linux/ipv6.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv6/netfilter/ip6t_frag.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv6/netfilter/ip6t_frag.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv6/netfilter/ip6t_frag.c 2003-12-18 05:36:37.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv6/netfilter/ip6t_frag.c 2004-01-19 08:51:43.487905216 -0500
@@ -1,4 +1,12 @@
/* Kernel module to match FRAG parameters. */
+
+/* (C) 2001-2002 Andras Kis-Szabo <kisza@sch.bme.hu>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
#include <linux/module.h>
#include <linux/skbuff.h>
#include <linux/ipv6.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv6/netfilter/ip6t_hbh.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv6/netfilter/ip6t_hbh.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv6/netfilter/ip6t_hbh.c 2003-12-18 05:39:19.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv6/netfilter/ip6t_hbh.c 2004-01-19 08:52:01.977094432 -0500
@@ -1,4 +1,12 @@
/* Kernel module to match Hop-by-Hop and Destination parameters. */
+
+/* (C) 2001-2002 Andras Kis-Szabo <kisza@sch.bme.hu>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
#include <linux/module.h>
#include <linux/skbuff.h>
#include <linux/ipv6.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv6/netfilter/ip6t_hl.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv6/netfilter/ip6t_hl.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv6/netfilter/ip6t_hl.c 2003-12-18 05:38:41.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv6/netfilter/ip6t_hl.c 2004-01-19 08:52:44.749592024 -0500
@@ -1,9 +1,11 @@
-/*
- * Hop Limit matching module
- * Maciej Soltysiak <solt@dns.toxicfilms.tv>
+/* Hop Limit matching module */
+
+/* (C) 2001-2002 Maciej Soltysiak <solt@dns.toxicfilms.tv>
* Based on HW's ttl module
*
- * This software is distributed under the terms GNU GPL
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*/
#include <linux/module.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv6/netfilter/ip6t_ipv6header.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv6/netfilter/ip6t_ipv6header.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv6/netfilter/ip6t_ipv6header.c 2003-12-18 05:40:15.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv6/netfilter/ip6t_ipv6header.c 2004-01-19 08:53:19.299339664 -0500
@@ -1,9 +1,16 @@
/* ipv6header match - matches IPv6 packets based
-on whether they contain certain headers */
+ on whether they contain certain headers */
/* Original idea: Brad Chapman
* Rewritten by: Andras Kis-Szabo <kisza@sch.bme.hu> */
+/* (C) 2001-2002 Andras Kis-Szabo <kisza@sch.bme.hu>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
#include <linux/module.h>
#include <linux/skbuff.h>
#include <linux/ipv6.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv6/netfilter/ip6t_length.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv6/netfilter/ip6t_length.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv6/netfilter/ip6t_length.c 2003-12-18 05:39:57.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv6/netfilter/ip6t_length.c 2004-01-19 08:53:49.951679800 -0500
@@ -1,5 +1,13 @@
/* Length Match - IPv6 Port */
+/* (C) 1999-2001 James Morris <jmorros@intercode.com.au>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+
#include <linux/module.h>
#include <linux/skbuff.h>
#include <linux/netfilter_ipv6/ip6t_length.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv6/netfilter/ip6t_limit.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv6/netfilter/ip6t_limit.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv6/netfilter/ip6t_limit.c 2003-12-18 05:36:41.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv6/netfilter/ip6t_limit.c 2004-01-19 08:54:11.999328048 -0500
@@ -1,12 +1,18 @@
/* Kernel module to control the rate
*
- * Jérôme de Vivie <devivie@info.enserb.u-bordeaux.fr>
- * Hervé Eychenne <eychenne@info.enserb.u-bordeaux.fr>
- *
* 2 September 1999: Changed from the target RATE to the match
* `limit', removed logging. Did I mention that
* Alexey is a fucking genius?
* Rusty Russell (rusty@rustcorp.com.au). */
+
+/* (C) 1999 Jérôme de Vivie <devivie@info.enserb.u-bordeaux.fr>
+ * (C) 1999 Hervé Eychenne <eychenne@info.enserb.u-bordeaux.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
#include <linux/module.h>
#include <linux/skbuff.h>
#include <linux/spinlock.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv6/netfilter/ip6t_mac.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv6/netfilter/ip6t_mac.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv6/netfilter/ip6t_mac.c 2003-12-18 05:39:44.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv6/netfilter/ip6t_mac.c 2004-01-19 08:54:36.410616968 -0500
@@ -1,4 +1,13 @@
/* Kernel module to match MAC address parameters. */
+
+/* (C) 1999-2001 Paul `Rusty' Russell
+ * (C) 2002-2004 Netfilter Core Team <coreteam@netfilter.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
#include <linux/module.h>
#include <linux/skbuff.h>
#include <linux/if_ether.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv6/netfilter/ip6t_mark.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv6/netfilter/ip6t_mark.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv6/netfilter/ip6t_mark.c 2003-12-18 05:40:34.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv6/netfilter/ip6t_mark.c 2004-01-19 08:55:00.975882480 -0500
@@ -1,4 +1,13 @@
/* Kernel module to match NFMARK values. */
+
+/* (C) 1999-2001 Marc Boucher <marc@mbsi.ca>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+
#include <linux/module.h>
#include <linux/skbuff.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv6/netfilter/ip6t_multiport.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv6/netfilter/ip6t_multiport.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv6/netfilter/ip6t_multiport.c 2003-12-18 05:40:04.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv6/netfilter/ip6t_multiport.c 2004-01-19 08:55:22.375629224 -0500
@@ -1,5 +1,14 @@
/* Kernel module to match one of a list of TCP/UDP ports: ports are in
the same place so we can treat them as equal. */
+
+/* (C) 1999-2001 Paul `Rusty' Russell
+ * (C) 2002-2004 Netfilter Core Team <coreteam@netfilter.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
#include <linux/module.h>
#include <linux/types.h>
#include <linux/udp.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv6/netfilter/ip6t_owner.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv6/netfilter/ip6t_owner.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv6/netfilter/ip6t_owner.c 2003-12-18 05:39:15.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv6/netfilter/ip6t_owner.c 2004-01-19 08:55:52.694020128 -0500
@@ -1,8 +1,13 @@
/* Kernel module to match various things tied to sockets associated with
- locally generated outgoing packets.
+ locally generated outgoing packets. */
- Copyright (C) 2000,2001 Marc Boucher
+/* (C) 2000-2001 Marc Boucher <marc@mbsi.ca>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*/
+
#include <linux/module.h>
#include <linux/skbuff.h>
#include <linux/file.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv6/netfilter/ip6t_rt.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv6/netfilter/ip6t_rt.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv6/netfilter/ip6t_rt.c 2003-12-18 05:36:49.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv6/netfilter/ip6t_rt.c 2004-01-19 08:56:16.796356016 -0500
@@ -1,4 +1,12 @@
/* Kernel module to match ROUTING parameters. */
+
+/* (C) 2001-2002 Andras Kis-Szabo <kisza@sch.bme.hu>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
#include <linux/module.h>
#include <linux/skbuff.h>
#include <linux/ipv6.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv6/netfilter/ip6table_filter.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv6/netfilter/ip6table_filter.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv6/netfilter/ip6table_filter.c 2003-12-18 05:35:56.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv6/netfilter/ip6table_filter.c 2004-01-19 08:56:45.606976136 -0500
@@ -2,7 +2,13 @@
* This is the 1999 rewrite of IP Firewalling, aiming for kernel 2.3.x.
*
* Copyright (C) 1999 Paul `Rusty' Russell & Michael J. Neuling
+ * Copyright (C) 2000-2004 Netfilter Core Team <coreteam@netfilter.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
*/
+
#include <linux/module.h>
#include <linux/netfilter_ipv6/ip6_tables.h>
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linuxppc25bh-031218-orinoco_monitor/net/ipv6/netfilter/ip6table_mangle.c linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv6/netfilter/ip6table_mangle.c
--- linuxppc25bh-031218-orinoco_monitor/net/ipv6/netfilter/ip6table_mangle.c 2003-12-18 05:37:28.000000000 -0500
+++ linuxppc25bh-031218-orinoco_monitor-gpl/net/ipv6/netfilter/ip6table_mangle.c 2004-01-19 08:57:08.802449888 -0500
@@ -2,6 +2,13 @@
* IPv6 packet mangling table, a port of the IPv4 mangle table to IPv6
*
* Copyright (C) 2000-2001 by Harald Welte <laforge@gnumonks.org>
+ * Copyright (C) 2000-2004 Netfilter Core Team <coreteam@netfilter.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * Extended to all five netfilter hooks by Brad Chapman & Harald Welte
*/
#include <linux/module.h>
#include <linux/netfilter_ipv6/ip6_tables.h>
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply
* Re: Patch for review and testing
From: Benjamin Herrenschmidt @ 2004-01-27 21:40 UTC (permalink / raw)
To: James Simmons
Cc: Geert Uytterhoeven, Linux Fbdev development list, Andrew Morton
In-Reply-To: <Pine.LNX.4.44.0401272006120.19265-100000@phoenix.infradead.org>
On Wed, 2004-01-28 at 07:07, James Simmons wrote:
> I like to submit this patch to linus today. Could you test it to see if it
> works on ppcs.
Well... you didn't update the drivers calling get_EDID_from_OF (I think
only rivafb at this point). Also, I plan to deprecate that function in
fbmon anyway, so don't bother, leave it alone for now. The way the
display/EDID infos are laid out in the OF device tree isn't that
generic and I'm considering letting each driver has its own version...
Also, that construct is plain wrong:
char *get_EDID_from_Firmware(struct device *dev)
{
.../...
pdev = to_pci_dev(dev);
Either pass a pci_dev in, or if not, at least check that you are
dealing with a pci device before casting struct device...
Finally, I don't see the point of submiting things to Linus at this
point, especially this patch which isn't critical (and you didn't even
submit driver changes for _using_ the new feature). Andrew is the
maintainer of current 2.6.x stable, patches have to go to him first,
stage in -mm for a while to be tested, and then go to Linus.
Ben.
> diff -urN -X /home/jsimmons/dontdiff linus-2.6/arch/i386/boot/video.S fbdev-2.6/arch/i386/boot/video.S
> --- linus-2.6/arch/i386/boot/video.S 2004-01-27 14:11:30.000000000 -0800
> +++ fbdev-2.6/arch/i386/boot/video.S 2004-01-27 13:28:20.000000000 -0800
> @@ -1889,6 +1889,7 @@
> ret
>
> store_edid:
> +#ifdef CONFIG_EDID_FIRMWARE
> pushw %es # just save all registers
> pushw %ax
> pushw %bx
> @@ -1919,6 +1920,7 @@
> popw %bx
> popw %ax
> popw %es
> +#endif /* CONFIG_EDID_FIRMWARE */
> ret
>
> # VIDEO_SELECT-only variables
> diff -urN -X /home/jsimmons/dontdiff linus-2.6/arch/i386/kernel/setup.c fbdev-2.6/arch/i386/kernel/setup.c
> --- linus-2.6/arch/i386/kernel/setup.c 2004-01-27 14:11:32.000000000 -0800
> +++ fbdev-2.6/arch/i386/kernel/setup.c 2004-01-27 13:46:34.000000000 -0800
> @@ -105,7 +105,9 @@
> unsigned short length;
> unsigned char table[0];
> };
> +#ifdef CONFIG_EDID_FIRMWARE
> struct edid_info edid_info;
> +#endif /* CONFIG_EDID_FIRMWARE */
> struct ist_info ist_info;
> struct e820map e820;
>
> @@ -1060,7 +1062,9 @@
> ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV);
> drive_info = DRIVE_INFO;
> screen_info = SCREEN_INFO;
> +#ifdef CONFIG_EDID_FIRMWARE
> edid_info = EDID_INFO;
> +#endif /* CONFIG_EDID_FIRMWARE */
> apm_info.bios = APM_BIOS_INFO;
> ist_info = IST_INFO;
> saved_videomode = VIDEO_MODE;
> diff -urN -X /home/jsimmons/dontdiff linus-2.6/drivers/video/Kconfig fbdev-2.6/drivers/video/Kconfig
> --- linus-2.6/drivers/video/Kconfig 2004-01-27 14:17:11.000000000 -0800
> +++ fbdev-2.6/drivers/video/Kconfig 2004-01-27 11:46:36.000000000 -0800
> @@ -38,6 +38,18 @@
> (e.g. an accelerated X server) and that are not frame buffer
> device-aware may cause unexpected results. If unsure, say N.
>
> +config EDID_FIRMWARE
> + bool "Get EDID using the platform's firmware"
> + depends on X86
> + default n
> + help
> + If you choose Y, the EDID (useful for setting video modes) will be
> + acquired using a BIOS call before the kernel boots to protected mode.
> + For computers with broken BIOSes, this can hang your computer. This can
> + also be a very slow process.
> +
> + If unsure, choose N.
> +
> config FB_CIRRUS
> tristate "Cirrus Logic support"
> depends on FB && (AMIGA || PCI) && BROKEN
> diff -urN -X /home/jsimmons/dontdiff linus-2.6/drivers/video/fbmon.c fbdev-2.6/drivers/video/fbmon.c
> --- linus-2.6/drivers/video/fbmon.c 2004-01-27 14:17:12.000000000 -0800
> +++ fbdev-2.6/drivers/video/fbmon.c 2004-01-27 11:55:32.000000000 -0800
> @@ -828,42 +828,42 @@
> printk("========================================\n");
> }
>
> -#ifdef CONFIG_PPC_OF
> -char *get_EDID_from_OF(struct pci_dev *pdev)
> +#ifdef CONFIG_EDID_FIRMWARE
> +char *get_EDID_from_Firmware(struct device *dev)
> {
> +#ifdef CONFIG_PPC_OF
> static char *propnames[] =
> { "DFP,EDID", "LCD,EDID", "EDID", "EDID1", NULL };
> unsigned char *pedid = NULL;
> struct device_node *dp;
> + struct pci_dev *pdev;
> int i;
>
> + pdev = to_pci_dev(dev);
> +
> if (pdev == NULL)
> return NULL;
> dp = pci_device_to_OF_node(pdev);
> - while (dp != NULL) {
> + while (dp) {
> for (i = 0; propnames[i] != NULL; ++i) {
> pedid = (unsigned char *) get_property(dp, propnames[i], NULL);
> - if (pedid != NULL)
> + if (pedid)
> return pedid;
> }
> dp = dp->child;
> }
> - show_edid(pedid);
> - return pedid;
> -}
> #endif
> -
> #ifdef CONFIG_X86
> -char *get_EDID_from_BIOS(void *dummy)
> -{
> - unsigned char *pedid = edid_info.dummy;
> -
> + unsigned char *pedid = NULL;
> +
> + pedid = edid_info.dummy;
> if (!pedid)
> return NULL;
> +#endif
> show_edid(pedid);
> - return pedid;
> + return pedid;
> }
> -#endif
> +#endif /* CONFIG_EDID_FIRMWARE */
>
> /*
> * VESA Generalized Timing Formula (GTF)
> @@ -1229,11 +1229,8 @@
>
> EXPORT_SYMBOL(parse_edid);
> EXPORT_SYMBOL(show_edid);
> -#ifdef CONFIG_X86
> -EXPORT_SYMBOL(get_EDID_from_BIOS);
> -#endif
> -#ifdef CONFIG_PPC_OF
> -EXPORT_SYMBOL(get_EDID_from_OF);
> +#ifdef CONFIG_EDID_FIRMWARE
> +EXPORT_SYMBOL(get_EDID_from_Firmware);
> #endif
> EXPORT_SYMBOL(fb_get_monitor_limits);
> EXPORT_SYMBOL(fb_get_mode);
--
Benjamin Herrenschmidt <benh@kernel.crashing.org>
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
^ permalink raw reply
* [Kernel-janitors] [PATCH] drivers/video/vga16fb.c ioremap() and
From: Leann Ogasawara @ 2004-01-27 21:44 UTC (permalink / raw)
To: kernel-janitors
In-Reply-To: <1075239420.3744.18.camel@ibm-d.pdx.osdl.net>
Hi All,
This is an updated patch of the previous ioremap/iounmap patch I
submitted for vga16fb.c This not only includes the ioremap audit and
error handling but also include fb_alloc_cmap() audit and error
handling. Thanks,
Leann
diffed against 2.6.2-rc2
note: there are more cases of fb_alloc_cmap() needing to be audited
that I'll get around to later.
=== drivers/video/vga16fb.c 1.33 vs edited ==--- 1.33/drivers/video/vga16fb.c Thu Apr 24 03:30:41 2003
+++ edited/drivers/video/vga16fb.c Mon Jan 26 17:33:26 2004
@@ -1341,6 +1341,7 @@
int __init vga16fb_init(void)
{
int i;
+ int ret;
printk(KERN_DEBUG "vga16fb: initializing\n");
@@ -1349,7 +1350,8 @@
vga16fb.screen_base = ioremap(VGA_FB_PHYS, VGA_FB_PHYS_LEN);
if (!vga16fb.screen_base) {
printk(KERN_ERR "vga16fb: unable to map device\n");
- return -ENOMEM;
+ ret = -ENOMEM;
+ goto err_ioremap;
}
printk(KERN_INFO "vga16fb: mapped to 0x%p\n", vga16fb.screen_base);
@@ -1371,28 +1373,44 @@
vga16fb.flags = FBINFO_FLAG_DEFAULT;
i = (vga16fb_defined.bits_per_pixel = 8) ? 256 : 16;
- fb_alloc_cmap(&vga16fb.cmap, i, 0);
-
- if (vga16fb_check_var(&vga16fb.var, &vga16fb))
- return -EINVAL;
+ ret = fb_alloc_cmap(&vga16fb.cmap, i, 0);
+ if (ret) {
+ printk(KERN_ERR "vga16fb: unable to allocate colormap\n");
+ ret = -ENOMEM;
+ goto err_alloc_cmap;
+ }
+ if (vga16fb_check_var(&vga16fb.var, &vga16fb)) {
+ printk(KERN_ERR "vga16fb: unable to validate variable\n");
+ ret = -EINVAL;
+ goto err_check_var;
+ }
vga16fb_update_fix(&vga16fb);
if (register_framebuffer(&vga16fb) < 0) {
- iounmap(vga16fb.screen_base);
- return -EINVAL;
+ printk(KERN_ERR "vga16fb: unable to register framebuffer\n");
+ ret = -EINVAL;
+ goto err_check_var;
}
printk(KERN_INFO "fb%d: %s frame buffer device\n",
vga16fb.node, vga16fb.fix.id);
return 0;
+
+ err_check_var:
+ fb_dealloc_cmap(&vga16fb.cmap);
+ err_alloc_cmap:
+ iounmap(vga16fb.screen_base);
+ err_ioremap:
+ return ret;
}
static void __exit vga16fb_exit(void)
{
unregister_framebuffer(&vga16fb);
iounmap(vga16fb.screen_base);
+ fb_dealloc_cmap(&vga16fb.cmap);
/* XXX unshare VGA regions */
}
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply
* Re: [PATCH][2.6] PCI Scan all functions
From: Greg KH @ 2004-01-27 21:44 UTC (permalink / raw)
To: Andrew Morton, Ivan Kokshaysky
Cc: moilanen, johnrose, linux-kernel, torvalds, Anton Blanchard
In-Reply-To: <20040127133314.0ddf00cd.akpm@osdl.org>
On Tue, Jan 27, 2004 at 01:33:14PM -0800, Andrew Morton wrote:
> Greg KH <greg@kroah.com> wrote:
> >
> > On Tue, Jan 27, 2004 at 10:55:01AM -0600, Jake Moilanen wrote:
> > > There are some arch, like PPC64, that need to be able to scan all the
> > > PCI functions. The problem comes in on a logically partitioned system
> > > where function 0 on a PCI-PCI bridge is assigned to one partition and
> > > say function 2 is assiged to another partition. On the second
> > > partition, it would appear that function 0 does not exist, but function
> > > 2 does. If all the functions are not scanned, everything under function
> > > 2 would not be detected.
> >
> > Heh, I think the PPC64 people need to get together and all talk about
> > this, as I just got a different patch, that solves much the same problem
> > from John Rose (it's on the linuxppc64 mailing list.)
> >
> > Can you two get together and not patch the same section of code to do
> > the same thing in different ways?
>
> While we're on the topic, what's with the below patch? I've had it in -mm
> for ages but apparently there's some disagreement over it.
It looks ok to me, but Linus and Ivan were the ones disagreeing over how
to implement this correctly, as they understand the resource management
logic a lot better than I.
They should be the ones to say if this is ok or not.
thanks,
greg k-h
> From: Anton Blanchard <anton@samba.org>
>
> We have IO BARs on ppc64 machines that begin at address 0. The current
> pci probe code will ignore anything that starts at 0. Remove these checks.
>
>
>
> ---
>
> drivers/pci/probe.c | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff -puN drivers/pci/probe.c~ppc64-bar-0-fix drivers/pci/probe.c
> --- 25/drivers/pci/probe.c~ppc64-bar-0-fix 2004-01-13 23:23:18.000000000 -0800
> +++ 25-akpm/drivers/pci/probe.c 2004-01-13 23:23:18.000000000 -0800
> @@ -176,7 +176,7 @@ void __devinit pci_read_bridge_bases(str
> limit |= (io_limit_hi << 16);
> }
>
> - if (base && base <= limit) {
> + if (base <= limit) {
> res->flags = (io_base_lo & PCI_IO_RANGE_TYPE_MASK) | IORESOURCE_IO;
> res->start = base;
> res->end = limit + 0xfff;
> @@ -187,7 +187,7 @@ void __devinit pci_read_bridge_bases(str
> pci_read_config_word(dev, PCI_MEMORY_LIMIT, &mem_limit_lo);
> base = (mem_base_lo & PCI_MEMORY_RANGE_MASK) << 16;
> limit = (mem_limit_lo & PCI_MEMORY_RANGE_MASK) << 16;
> - if (base && base <= limit) {
> + if (base <= limit) {
> res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM;
> res->start = base;
> res->end = limit + 0xfffff;
> @@ -213,7 +213,7 @@ void __devinit pci_read_bridge_bases(str
> }
> #endif
> }
> - if (base && base <= limit) {
> + if (base <= limit) {
> res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM | IORESOURCE_PREFETCH;
> res->start = base;
> res->end = limit + 0xfffff;
>
> _
^ permalink raw reply
* [PATCH 2.6] netfilter /proc/net/ip_conntrack locking fix
From: Harald Welte @ 2004-01-27 21:45 UTC (permalink / raw)
To: David Miller; +Cc: Netfilter Development Mailinglist
[-- Attachment #1: Type: text/plain, Size: 2545 bytes --]
Hi Dave!
Please apply the following fix to your 2.6.x tree.
Thanks.
Name: Grab ip_conntrack_expect_tuple_lock in list_conntracks
Author: Rusty Russell
Status: Experimental
D: http://bugme.osdl.org/show_bug.cgi?id=1764
D: We're walking the expect list without the ip_conntrack_expect_tuple_lock.
diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal .20891-linux-2.6.1-rc1/include/linux/netfilter_ipv4/ip_conntrack_core.h .20891-linux-2.6.1-rc1.updated/include/linux/netfilter_ipv4/ip_conntrack_core.h
--- .20891-linux-2.6.1-rc1/include/linux/netfilter_ipv4/ip_conntrack_core.h 2003-09-22 10:26:46.000000000 +1000
+++ .20891-linux-2.6.1-rc1.updated/include/linux/netfilter_ipv4/ip_conntrack_core.h 2004-01-03 15:27:14.000000000 +1100
@@ -50,5 +50,6 @@ static inline int ip_conntrack_confirm(s
extern struct list_head *ip_conntrack_hash;
extern struct list_head ip_conntrack_expect_list;
DECLARE_RWLOCK_EXTERN(ip_conntrack_lock);
+DECLARE_RWLOCK_EXTERN(ip_conntrack_expect_tuple_lock);
#endif /* _IP_CONNTRACK_CORE_H */
diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal .20891-linux-2.6.1-rc1/net/ipv4/netfilter/ip_conntrack_standalone.c .20891-linux-2.6.1-rc1.updated/net/ipv4/netfilter/ip_conntrack_standalone.c
--- .20891-linux-2.6.1-rc1/net/ipv4/netfilter/ip_conntrack_standalone.c 2003-12-18 15:53:34.000000000 +1100
+++ .20891-linux-2.6.1-rc1.updated/net/ipv4/netfilter/ip_conntrack_standalone.c 2004-01-03 15:23:40.000000000 +1100
@@ -154,6 +154,7 @@ list_conntracks(char *buffer, char **sta
}
/* Now iterate through expecteds. */
+ READ_LOCK(&ip_conntrack_expect_tuple_lock);
list_for_each(e, &ip_conntrack_expect_list) {
unsigned int last_len;
struct ip_conntrack_expect *expect
@@ -164,10 +165,12 @@ list_conntracks(char *buffer, char **sta
len += print_expect(buffer + len, expect);
if (len > length) {
len = last_len;
- goto finished;
+ goto finished_expects;
}
}
+ finished_expects:
+ READ_UNLOCK(&ip_conntrack_expect_tuple_lock);
finished:
READ_UNLOCK(&ip_conntrack_lock);
--
- Harald Welte <laforge@netfilter.org> http://www.netfilter.org/
============================================================================
"Fragmentation is like classful addressing -- an interesting early
architectural error that shows how much experimentation was going
on while IP was being designed." -- Paul Vixie
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply
* Re: [Jfs-discussion] md raid + jfs + jfs_fsck
From: Gene Heskett @ 2004-01-27 21:47 UTC (permalink / raw)
To: linux-kernel
In-Reply-To: <20040127205324.A19913@infradead.org>
On Tuesday 27 January 2004 15:53, Christoph Hellwig wrote:
>On Tue, Jan 27, 2004 at 02:43:05PM -0600, Dave Kleikamp wrote:
>> My guess is that software raid is stealing a few blocks from the
>> end of the partition,
>
>Yes, it does. But JFS should get the right size from the gendisk
> anyway. Or did you create the raid with the filesystem already
> existant? While that appears to work for a non-full ext2/ext3
> filesystem it's not something you should do because it makes the
> filesystem internal bookkeeping wrong and you'll run into trouble
> with any filesystem sooner or later.
>
I wonder if this discussion has anything to do with what we perceive
as an excruciatingly long resync time? Should the array be
reformatted after startup with a new mkreiserfs in the event thats
what we are running on a raid5?
If it exists, please point me to a good, maybe better than that which
comes with mdtools, discussion, web site or whatever please.
>-
>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/
--
Cheers, Gene
"There are four boxes to be used in defense of liberty: soap,
ballot, jury, and ammo. Please use in that order."
-Ed Howdershelt (Author)
99.22% setiathome rank, not too shabby for a WV hillbilly
Yahoo.com attornies please note, additions to this message
by Gene Heskett are:
Copyright 2004 by Maurice Eugene Heskett, all rights reserved.
^ permalink raw reply
* [ALSA - driver 0000005]: alsa-driver-1.0.2: unresolved symbols in snd.o
From: noreply @ 2004-01-27 21:48 UTC (permalink / raw)
To: alsa-devel
A BUGNOTE has been added to this bug.
======================================================================
http://bugtrack.alsa-project.org/alsa-bug/bug_view_page.php?bug_id=0000005
======================================================================
Reporter: ZlatkO
Handler: perex
======================================================================
Project: ALSA - driver
Bug ID: 5
Category: 0_compilation problem_!!!
Reproducibility: always
Severity: block
Priority: immediate
Status: assigned
Distribution: Slackware 8.1
Kernel Version: 2.4.24
======================================================================
Date Submitted: 01-27-2004 21:31 CET
Last Modified: 01-27-2004 22:48 CET
======================================================================
Summary: alsa-driver-1.0.2: unresolved symbols in snd.o
Description:
snd.o fails to load due to an unresolved symbol ("sound_class") on a
Slackware 8.1 system, kernel 2.4.24 (plain vanilla from kernel.org),
modutils-2.4.16.
There is no "sound_class" in the kernel's own
/usr/src/linux-2.4.24/drivers/sound/sound_core.c - am I supposed to
replace it with alsa-kernel/sound_core.c? This was not necessary in
previous ALSA versions.
======================================================================
----------------------------------------------------------------------
perex - 01-27-2004 22:08 CET
----------------------------------------------------------------------
I cannot reproduce this bug, but it might be possible that removing
of line 'extern struct class_simple *sound_class;' in
alsa-driver/alsa-kernel/core/sound.c solves this bug.
Can you confirm?
I've recreated new alsa-driver package with date:
Jan 27 22:02 alsa-driver-1.0.2.tar.bz2
----------------------------------------------------------------------
khali - 01-27-2004 22:18 CET
----------------------------------------------------------------------
Doesn't work for me. Even worse, alsa-driver doesn't compile anymore after
I commented the line out:
sound.c: In function `snd_register_device_R1f4c5f07':
sound.c:239: `sound_class' undeclared (first use in this function)
sound.c:239: (Each undeclared identifier is reported only once
sound.c:239: for each function it appears in.)
sound.c: In function `alsa_sound_init':
sound.c:376: `sound_class' undeclared (first use in this function)
sound.c: At top level:
sound.c:41: warning: `device_mode' defined but not used
make[1]: *** [sound.o] Error 1
make[1]: Leaving directory `/usr/src/alsa-driver-1.0.2/acore'
make: *** [compile] Error 1
----------------------------------------------------------------------
perex - 01-27-2004 22:39 CET
----------------------------------------------------------------------
Ok, can you add '#define sound_class NULL' after removing of suggested line
(on the same place)? Note that the rebuilt alsa-driver package has this
fix included.
edited on: 01-27-04 22:39
----------------------------------------------------------------------
khali - 01-27-2004 22:48 CET
----------------------------------------------------------------------
OK, works fine for me.
Thanks.
Bug History
Date Modified Username Field Change
======================================================================
01-27-04 21:31 ZlatkO New Bug
01-27-04 22:08 perex Bugnote Added: 0000005
01-27-04 22:08 perex Assigned To => perex
01-27-04 22:08 perex Status new => assigned
01-27-04 22:08 perex Priority normal => immediate
01-27-04 22:15 perex Category CORE - control => 0_compilation problem_!!!
01-27-04 22:18 khali Bugnote Added: 0000007
01-27-04 22:37 perex Bugnote Added: 0000008
01-27-04 22:39 perex Bugnote Edited: 0000008
01-27-04 22:48 khali Bugnote Added: 0000009
======================================================================
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
^ permalink raw reply
* [PATCH 2.4] netfilter ipt_conntrack/ipt_state moduse count
From: Harald Welte @ 2004-01-27 21:48 UTC (permalink / raw)
To: David Miller; +Cc: Netfilter Development Mailinglist
[-- Attachment #1.1: Type: text/plain, Size: 509 bytes --]
Hi Dave!
Please apply the following fix to your 2.4.x tree. A 2.6.x fix is not
needed, because of it's different reference counting.
Thanks.
--
- Harald Welte <laforge@netfilter.org> http://www.netfilter.org/
============================================================================
"Fragmentation is like classful addressing -- an interesting early
architectural error that shows how much experimentation was going
on while IP was being designed." -- Paul Vixie
[-- Attachment #1.2: linux-2.4.patch --]
[-- Type: text/plain, Size: 1844 bytes --]
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linux-2.4.24/net/ipv4/netfilter/ipt_conntrack.c linux-2.4.24-usecount/net/ipv4/netfilter/ipt_conntrack.c
--- linux-2.4.24/net/ipv4/netfilter/ipt_conntrack.c 2003-06-13 10:51:39.000000000 -0400
+++ linux-2.4.24-usecount/net/ipv4/netfilter/ipt_conntrack.c 2004-01-21 08:50:59.232369344 -0500
@@ -109,10 +109,15 @@
static int __init init(void)
{
+ int ret;
+
/* NULL if ip_conntrack not a module */
if (ip_conntrack_module)
__MOD_INC_USE_COUNT(ip_conntrack_module);
- return ipt_register_match(&conntrack_match);
+ ret = ipt_register_match(&conntrack_match);
+ if (ret)
+ __MOD_DEC_USE_COUNT(ip_conntrack_module);
+ return ret;
}
static void __exit fini(void)
diff -Nru --exclude-from /space/home/laforge/scripts/dontdiff --exclude .depend --exclude '*.o' --exclude '*.ko' --exclude '*.ver' --exclude '.*.flags' --exclude '*.orig' --exclude '*.rej' --exclude '*.cmd' --exclude '*.mod.c' --exclude '*~' linux-2.4.24/net/ipv4/netfilter/ipt_state.c linux-2.4.24-usecount/net/ipv4/netfilter/ipt_state.c
--- linux-2.4.24/net/ipv4/netfilter/ipt_state.c 2001-09-30 15:26:08.000000000 -0400
+++ linux-2.4.24-usecount/net/ipv4/netfilter/ipt_state.c 2004-01-21 08:49:36.054014376 -0500
@@ -46,10 +46,15 @@
static int __init init(void)
{
+ int ret;
+
/* NULL if ip_conntrack not a module */
if (ip_conntrack_module)
__MOD_INC_USE_COUNT(ip_conntrack_module);
- return ipt_register_match(&state_match);
+ ret = ipt_register_match(&state_match);
+ if (ret)
+ __MOD_DEC_USE_COUNT(ip_conntrack_module);
+ return ret;
}
static void __exit fini(void)
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply
* [ALSA - driver 0000005]: alsa-driver-1.0.2: unresolved symbols in snd.o
From: noreply @ 2004-01-27 21:48 UTC (permalink / raw)
To: alsa-devel
A BUGNOTE has been added to this bug.
======================================================================
http://bugtrack.alsa-project.org/alsa-bug/bug_view_page.php?bug_id=0000005
======================================================================
Reporter: ZlatkO
Handler: perex
======================================================================
Project: ALSA - driver
Bug ID: 5
Category: 0_compilation problem_!!!
Reproducibility: always
Severity: block
Priority: immediate
Status: assigned
Distribution: Slackware 8.1
Kernel Version: 2.4.24
======================================================================
Date Submitted: 01-27-2004 21:31 CET
Last Modified: 01-27-2004 22:48 CET
======================================================================
Summary: alsa-driver-1.0.2: unresolved symbols in snd.o
Description:
snd.o fails to load due to an unresolved symbol ("sound_class") on a
Slackware 8.1 system, kernel 2.4.24 (plain vanilla from kernel.org),
modutils-2.4.16.
There is no "sound_class" in the kernel's own
/usr/src/linux-2.4.24/drivers/sound/sound_core.c - am I supposed to
replace it with alsa-kernel/sound_core.c? This was not necessary in
previous ALSA versions.
======================================================================
----------------------------------------------------------------------
perex - 01-27-2004 22:08 CET
----------------------------------------------------------------------
I cannot reproduce this bug, but it might be possible that removing
of line 'extern struct class_simple *sound_class;' in
alsa-driver/alsa-kernel/core/sound.c solves this bug.
Can you confirm?
I've recreated new alsa-driver package with date:
Jan 27 22:02 alsa-driver-1.0.2.tar.bz2
----------------------------------------------------------------------
khali - 01-27-2004 22:18 CET
----------------------------------------------------------------------
Doesn't work for me. Even worse, alsa-driver doesn't compile anymore after
I commented the line out:
sound.c: In function `snd_register_device_R1f4c5f07':
sound.c:239: `sound_class' undeclared (first use in this function)
sound.c:239: (Each undeclared identifier is reported only once
sound.c:239: for each function it appears in.)
sound.c: In function `alsa_sound_init':
sound.c:376: `sound_class' undeclared (first use in this function)
sound.c: At top level:
sound.c:41: warning: `device_mode' defined but not used
make[1]: *** [sound.o] Error 1
make[1]: Leaving directory `/usr/src/alsa-driver-1.0.2/acore'
make: *** [compile] Error 1
----------------------------------------------------------------------
perex - 01-27-2004 22:39 CET
----------------------------------------------------------------------
Ok, can you add '#define sound_class NULL' after removing of suggested line
(on the same place)? Note that the rebuilt alsa-driver package has this
fix included.
edited on: 01-27-04 22:39
----------------------------------------------------------------------
khali - 01-27-2004 22:48 CET
----------------------------------------------------------------------
OK, works fine for me.
Thanks.
----------------------------------------------------------------------
ZlatkO - 01-27-2004 22:48 CET
----------------------------------------------------------------------
Works fine here after the second fix (same problem after the first one).
Thanks! :-)
Bug History
Date Modified Username Field Change
======================================================================
01-27-04 21:31 ZlatkO New Bug
01-27-04 22:08 perex Bugnote Added: 0000005
01-27-04 22:08 perex Assigned To => perex
01-27-04 22:08 perex Status new => assigned
01-27-04 22:08 perex Priority normal => immediate
01-27-04 22:15 perex Category CORE - control => 0_compilation problem_!!!
01-27-04 22:18 khali Bugnote Added: 0000007
01-27-04 22:37 perex Bugnote Added: 0000008
01-27-04 22:39 perex Bugnote Edited: 0000008
01-27-04 22:48 khali Bugnote Added: 0000009
01-27-04 22:48 ZlatkO Bugnote Added: 0000010
======================================================================
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
^ permalink raw reply
* Re: SMP AMD64 (Tyan S2882) problems.
From: Jan Kasprzak @ 2004-01-27 21:49 UTC (permalink / raw)
To: Andi Kleen; +Cc: linux-kernel
In-Reply-To: <p73fze1fdk4.fsf@nielsen.suse.de>
Andi Kleen wrote:
: Jan Kasprzak <kas@informatics.muni.cz> writes:
:
: You don't say if you run a 32bit or a 64bit kernel. I will assume 64bit.
:
Correct.
: > Is it normal? How can I set up some IRQ balancing (or at least hard-wire
: > 3ware for CPU1 and eth0 for CPU0)?
:
: Run irqbalanced
:
Thanks (in my system - Fedora Core 0.96 - it is "irqbalance", without
the "d" at the end, from kernel-utils package). When I ran it it migrated
some IRQs to CPU1, so this is probably OK. Thanks.
: > Problem 2: the 3ware controller does not work correctly on the first
: > PCI bus (slot 1 and 2) - in slot 1 it hangs under bigger load (e.g.
: > an array rebuild), in slot 2 it hangs during boot in 3ware BIOS.
: > It is probably not Linux-specific, but has anyone seen the same problem?
:
: I haven't seen it.
:
: You can try if it goes away when you disable ACPI PCI routing
: (pci=noacpi)
I will try tomorrow.
: > Problem 3:
: > What the "PCI-DMA: Disabling IOMMU." message in dmesg output means?
:
: Ok you run a 64bit kernel. You don't have enough memory to require
: the IOMMU. That's fine.
This is what I expected. OK.
: > Problem 4:
: > Does Linux support the hardware sensors on this board? The i2c driver
: > AMD8111 seems to be working, but what sensors driver should I use?
:
: Most likely the Winbond W83627HF
:
: iirc it's not possible in 2.6.1 to enable it. You have to drop the
: ISA dependency for "I2C_ISA" in drivers/i2c/busses/Kconfig
Exactly. Thanks for the hint.
: > Problem 5:
: > Is there a 3ware configuration program (tw_cli), which works on AMD64?
:
: You can try if the 32bit program works. If not ask 3ware.
Does not work:
ioctl32(tw_cli:32216): Unknown cmd fd(3) cmd(0000001f){00} arg(080dd2e0) on /dev/twe0
I have asked 3ware.
Thanks for your help,
-Yenya
--
| Jan "Yenya" Kasprzak <kas at {fi.muni.cz - work | yenya.net - private}> |
| GPG: ID 1024/D3498839 Fingerprint 0D99A7FB206605D7 8B35FCDE05B18A5E |
| http://www.fi.muni.cz/~kas/ Czech Linux Homepage: http://www.linux.cz/ |
| I actually have a lot of admiration and respect for the PATA knowledge |
| embedded in drivers/ide. But I would never call it pretty:) -Jeff Garzik |
^ permalink raw reply
* Re: Encrypted Filesystem
From: Hans Reiser @ 2004-01-27 21:51 UTC (permalink / raw)
To: Michael Halcrow; +Cc: LKML
In-Reply-To: <20040127212546.GA10831@halcrow.us>
Michael Halcrow wrote:
>
> I am
>aware of reiser4; Hans may remember having lunch with me at the
>DISCEX-III conference in Washington, D.C. last year. My booth (the
>BYU Internet Security Research Lab; Trust Negotiation) was right
>across from his:
>
>http://csdl.computer.org/comp/proceedings/discex/2003/1897/02/1897toc.htm
>
>He had a lengthy discussion with Jason Holt[2] on the implementation
>of crypto in reiser4.
>
>While I appreciate the security features that are part of reiser4, my
>efforts toward filesystem encryption are aimed at a more general
>level, to provide an encryption layer that will work across several
>filesystems. Perhaps we can look into unifying and abstracting the
>key management, authentication, and other aspects involved in a
>comprehensive filesystem encryption system, extending and using kernel
>structures (struct file, kobject/sysfs, etc.) to maintain that data,
>so whether someone is using reiser4, Security Enhanced ext3 (SEext3),
>or Security Enhanced jfs (SEjfs)[3], the interface to userland will be
>the same.
>
>
I am in principle interested in doing this, especially since the area of
our inspiration is not in key management but in performance.
>
>[2] Hans: Jason was a co-worker of mine in the ISRL, skinny and tall
>with curly red hair (he's hard to forget once you've met him:
><http://isrl.cs.byu.edu/images/Dcp02290.jpg>)
>
>
Jason is working on a write only plugin (or at least he said so a few
months ago) for reiser4. You probably remember him discussing it then.
Where is your photo, or are you a CIA spy who needs to keep it
secret....;-) I remember three interesting people talked to me all at
once at that conference about reiser4 crypto and other things that crept
into that conversation, if you send your photo I can know if I remember
correctly which one other than Jason you were.
>[3] That was meant to be funny...
>.___________________________________________________________________.
> Michael A. Halcrow
> Security Software Engineer, IBM Linux Technology Center
>GnuPG Fingerprint: 05B5 08A8 713A 64C1 D35D 2371 2D3C FDDA 3EB6 601D
>
>
^ permalink raw reply
* [PATCH 2.6] netfilter Documentation/Changes
From: Harald Welte @ 2004-01-27 21:53 UTC (permalink / raw)
To: David Miller; +Cc: Netfilter Development Mailinglist
[-- Attachment #1.1: Type: text/plain, Size: 520 bytes --]
Hi Dave!
Please apply the following patch to your 2.6.x tree.
It makes the Changes file actually match what happened with 2.6.x.
Thanks.
--
- Harald Welte <laforge@netfilter.org> http://www.netfilter.org/
============================================================================
"Fragmentation is like classful addressing -- an interesting early
architectural error that shows how much experimentation was going
on while IP was being designed." -- Paul Vixie
[-- Attachment #1.2: 2.6.0-documentation-changes.patch --]
[-- Type: text/plain, Size: 1182 bytes --]
--- a/Documentation/Changes 2003-09-29 21:20:11.000000000 +0200
+++ b/Documentation/Changes 2003-11-02 09:56:09.000000000 +0100
@@ -237,13 +237,15 @@
General changes
---------------
-The IP firewalling and NAT code has been replaced again. The new
-netfilter software (including ipfwadm and ipchains backwards-
-compatible modules) is currently distributed separately.
-
If you have advanced network configuration needs, you should probably
consider using the network tools from ip-route2.
+Packet Filter / NAT
+-------------------
+The packet filtering and NAT code uses the same tools like the previous 2.4.x
+kernel series (iptables). It still includes backwards-compatibility modules
+for 2.2.x-style ipchains and 2.0.x-style ipfwadm.
+
PPP
---
@@ -400,11 +402,9 @@
---------
o <http://sourceforge.net/project/showfiles.php?group_id=14>
-Netfilter
----------
-o <http://netfilter.filewatcher.org/iptables-1.2.tar.bz2>
-o <http://netfilter.samba.org/iptables-1.2.tar.bz2>
-o <http://netfilter.kernelnotes.org/iptables-1.2.tar.bz2>
+Iptables
+--------
+o <http://www.iptables.org/downloads.html>
Ip-route2
---------
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply
* Re: [Kernel-janitors] [PATCH] drivers/video/fbcmap.c kmalloc audit
From: Arnaldo Carvalho de Melo @ 2004-01-27 21:53 UTC (permalink / raw)
To: kernel-janitors
In-Reply-To: <1075239420.3744.18.camel@ibm-d.pdx.osdl.net>
Em Tue, Jan 27, 2004 at 01:37:01PM -0800, Leann Ogasawara escreveu:
> Hi All,
>
> Patch to audit kmalloc()'s and handle errors accordingly. Thanks,
>
> Leann
>
> diffed against 2.6.2-rc2
>
> === drivers/video/fbcmap.c 1.9 vs edited ==> --- 1.9/drivers/video/fbcmap.c Mon Mar 31 13:51:12 2003
> +++ edited/drivers/video/fbcmap.c Mon Jan 26 17:38:53 2004
> @@ -98,14 +98,14 @@
> if (!len)
> return 0;
> if (!(cmap->red = kmalloc(size, GFP_ATOMIC)))
> - return -1;
> + goto err_red;
> if (!(cmap->green = kmalloc(size, GFP_ATOMIC)))
> - return -1;
> + goto err_green;
> if (!(cmap->blue = kmalloc(size, GFP_ATOMIC)))
> - return -1;
> + goto err_blue;
> if (transp) {
> if (!(cmap->transp = kmalloc(size, GFP_ATOMIC)))
> - return -1;
> + goto err_transp;
> } else
> cmap->transp = NULL;
> }
> @@ -113,6 +113,17 @@
> cmap->len = len;
> fb_copy_cmap(fb_default_cmap(len), cmap, 0);
> return 0;
> +
> + err_transp:
> + kfree(cmap->blue);
> + err_blue:
> + kfree(cmap->green);
> + err_green:
> + kfree(cmap->red);
> + err_red:
> + cmap->red = cmap->green = cmap->blue = cmap->transp = NULL;
> + cmap->len = 0;
> + return -1;
Looks good to me.
- Arnaldo
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply
* RE: [linux-lvm] mounting snapshot errors
From: Little, Chris @ 2004-01-27 21:54 UTC (permalink / raw)
To: 'linux-lvm@sistina.com'
is the filesystem you are snapshotting still mounted when you execute the
snapshot? They need to be offline before the snapshot takes place.
-----Original Message-----
From: R Dicaire [mailto:rdicaire@kritek.net]
Sent: Tuesday, January 27, 2004 6:01 PM
To: lvm
Subject: [linux-lvm] mounting snapshot errors
I apologize for the repeat but never got a response.
I posted a few days ago regarding the inability to mount snapshots
if the volume's file system is ext3/xfs/reiserfs. Using current lvm
1.0.8 on linux kernel 2.4.23-xfs with lvm 1.0.8 patch and 1.0.8 lvm
tools.
Is there a fix for this issue?
--
aRDy Music
http://www.ardynet.com
_______________________________________________
linux-lvm mailing list
linux-lvm@sistina.com
http://lists.sistina.com/mailman/listinfo/linux-lvm
read the LVM HOW-TO at http://tldp.org/HOWTO/LVM-HOWTO/
^ permalink raw reply
* Re: [Kernel-janitors] [PATCH] drivers/video/fbcmap.c kmalloc audit
From: Daniele Bellucci @ 2004-01-27 21:54 UTC (permalink / raw)
To: kernel-janitors
In-Reply-To: <1075239420.3744.18.camel@ibm-d.pdx.osdl.net>
|+ err_transp:
|+ kfree(cmap->blue);
|+ err_blue:
|+ kfree(cmap->green);
|+ err_green:
|+ kfree(cmap->red);
|+ err_red:
|+ cmap->red = cmap->green = cmap->blue = cmap->transp = NULL;
|+ cmap->len = 0;
|+ return -1; <--+
|
---------------------+
|
+-> IMHO "return -1" should be replaced with "return -ENOMEM"
Tnx.
--
Daniele.
"I could have made money this way, and perhaps amused myself writing code.
But I knew that at the end of my career, I would look back on years of
building walls to divide people, and feel I had spent my life making the
world a worse place."
Richard Stallman
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply
* Re: udevinfo output broken
From: Olaf Hering @ 2004-01-27 21:54 UTC (permalink / raw)
To: linux-hotplug
In-Reply-To: <20040127200651.GA7974@suse.de>
On Tue, Jan 27, Olaf Hering wrote:
> On Tue, Jan 27, Kay Sievers wrote:
>
> > On Tue, Jan 27, 2004 at 09:06:51PM +0100, Olaf Hering wrote:
> > > udevinfo writes to fd 0, all the output is lost somehow.
> > >
> > > olaf@ibook:~> i="`/sbin/udevinfo -r 2>&1`"
> > > /dev/
> >
> > Seems like a klibc feature :)
> > libc works as expected.
>
> _fwrite gets 0x1 as f, calls fileno() which decrements it and passes it
> to write().
No idea if this is correct:
--- klibc-0.98/klibc/include/stdio.h 2004-01-22 21:56:49.000000000 +0100
+++ klibc/klibc/include/stdio.h 2004-01-27 22:50:27.000000000 +0100
@@ -15,9 +15,9 @@
struct _IO_file;
typedef struct _IO_file FILE;
-#define stdin ((FILE *)0)
-#define stdout ((FILE *)1)
-#define stderr ((FILE *)2)
+#define stdin ((FILE *)1)
+#define stdout ((FILE *)2)
+#define stderr ((FILE *)3)
#ifndef EOF
# define EOF (-1)
--
USB is for mice, FireWire is for men!
sUse lINUX ag, n√úRNBERG
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
Linux-hotplug-devel mailing list http://linux-hotplug.sourceforge.net
Linux-hotplug-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel
^ permalink raw reply
* Re: [OT] Sco
From: Maciej Zenczykowski @ 2004-01-27 21:54 UTC (permalink / raw)
To: Gene Heskett; +Cc: Linux Kernel
In-Reply-To: <200401271636.57691.gene.heskett@verizon.net>
> >> > Besides, DoS attacks against SCO will only be blamed on the
> >> > Linux community. So the developer of that virus is either a
> >> > complete idiot or is acting to intentionally hurt our image.
>
> I agree with the latter interpretation. Somebody who wants to give
> Darls unfounded rhetoric some traction in court next week.
Hell, this virus could have even been written by SCO (or someone working
for SCO or one of their shareholders) - precisely because it makes them
look like the victim - people have a tendency to feel sorry for poor
abused entities.
Cheers,
MaZe.
^ permalink raw reply
* Re: bk pull on ia64 linux tree
From: David Mosberger @ 2004-01-27 21:57 UTC (permalink / raw)
To: linux-ia64
In-Reply-To: <Pine.LNX.4.58.0401121658240.14305@evo.osdl.org>
>>>>> On 27 Jan 2004 05:23:22 -0500, Jes Sorensen <jes@wildopensource.com> said:
>>>>> "David" = David Mosberger <davidm@napali.hpl.hp.com> writes:
David> Hi Linus, please do a
David> bk pull http://lia64.bkbits.net/to-linus-2.5
David> This will update the files shown below (only ia64-specific
David> files are touched).
Jes> Is this patch available as a normall diff somewhere?
I don't make real patches for release-candidates, but in theory, you
should be able to get the equivalent patch from:
http://www.kernel.org/pub/linux/kernel/ports/ia64/v2.6/testing/cset/
In practice, it appears that the script that's supposed to create this
was failing. I fixed this now and the URL is working again.
--david
^ permalink raw reply
* Re: [PATCH][2.6] PCI Scan all functions
From: Linus Torvalds @ 2004-01-27 21:57 UTC (permalink / raw)
To: Andrew Morton; +Cc: Greg KH, moilanen, johnrose, linux-kernel, Anton Blanchard
In-Reply-To: <20040127133314.0ddf00cd.akpm@osdl.org>
On Tue, 27 Jan 2004, Andrew Morton wrote:
>
> While we're on the topic, what's with the below patch? I've had it in -mm
> for ages but apparently there's some disagreement over it.
I'd be very worried, since I'm pretty sure that there _are_ devices where
"zero means disabled".
On the other hand, the resource management should do the right thing
anyway, so I guess it should be safe. Especially if it's been in -mm for a
long time..
Linus
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.