linux-stable.git/net/ipv4/ip_input.c, branch linux-2.6.30.y Linux kernel stable tree inet: Call skb_orphan before tproxy activates 2009-08-16T21:18:17+00:00 Herbert Xu herbert@gondor.apana.org.au 2009-06-27T02:22:37+00:00 bda91e0e8dbd2b2a2c929411b288f0c3a16de8fa [ Upstream commit 71f9dacd2e4d233029e9e956ca3f79531f411827 ] As transparent proxying looks up the socket early and assigns it to the skb for later processing, we must drop any existing socket ownership prior to that in order to distinguish between the case where tproxy is active and where it is not. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> 
[ Upstream commit 71f9dacd2e4d233029e9e956ca3f79531f411827 ]

As transparent proxying looks up the socket early and assigns
it to the skb for later processing, we must drop any existing
socket ownership prior to that in order to distinguish between
the case where tproxy is active and where it is not.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2008-11-19T07:38:23+00:00 David S. Miller davem@davemloft.net 2008-11-19T07:38:23+00:00 198d6ba4d7f48c94f990f4604f0b3d73925e0ded Conflicts: drivers/isdn/i4l/isdn_net.c fs/cifs/connect.c 
Conflicts:

	drivers/isdn/i4l/isdn_net.c
	fs/cifs/connect.c
net: shy netns_ok check 2008-11-13T07:23:51+00:00 Alexey Dobriyan adobriyan@gmail.com 2008-11-13T07:23:51+00:00 9c0188acf6dd6990bac9cd906cd554a1476c6d12 Failure to pass netns_ok check is SILENT, except some MIB counter is incremented somewhere. And adding "netns_ok = 1" (after long head-scratching session) is usually the last step in making some protocol netns-ready... Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> 
Failure to pass netns_ok check is SILENT, except some MIB counter is
incremented somewhere.

And adding "netns_ok = 1" (after long head-scratching session) is
usually the last step in making some protocol netns-ready...

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net: clean up net/ipv4/ip_fragment.c tcp_timer.c ip_input.c 2008-11-03T10:47:38+00:00 Jianjun Kong jianjun@zeuux.org 2008-11-03T10:47:38+00:00 fd3f8c4cb632c28ef915a535617a0fcddcfe3f80 Signed-off-by: Jianjun Kong <jianjun@zeuux.org> Signed-off-by: David S. Miller <davem@davemloft.net> 
Signed-off-by: Jianjun Kong <jianjun@zeuux.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net: replace NIPQUAD() in net/ipv4/ net/ipv6/ 2008-10-31T07:53:57+00:00 Harvey Harrison harvey.harrison@gmail.com 2008-10-31T07:53:57+00:00 673d57e72398edfedc93fb50ff58048077c9d587 Using NIPQUAD() with NIPQUAD_FMT, %d.%d.%d.%d or %u.%u.%u.%u can be replaced with %pI4 Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> 
Using NIPQUAD() with NIPQUAD_FMT, %d.%d.%d.%d or %u.%u.%u.%u
can be replaced with %pI4

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net: Rationalise email address: Network Specific Parts 2008-10-14T02:01:08+00:00 Alan Cox alan@redhat.com 2008-10-14T02:01:08+00:00 113aa838ec3a235d883f8357d31d90e16c47fc89 Clean up the various different email addresses of mine listed in the code to a single current and valid address. As Dave says his network merges for 2.6.28 are now done this seems a good point to send them in where they won't risk disrupting real changes. Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net> 
Clean up the various different email addresses of mine listed in the code
to a single current and valid address. As Dave says his network merges
for 2.6.28 are now done this seems a good point to send them in where
they won't risk disrupting real changes.

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
mib: put ip statistics on struct net 2008-07-18T11:02:42+00:00 Pavel Emelyanov xemul@openvz.org 2008-07-18T11:02:42+00:00 a20f5799ca7ceb24d63c74b6fdad4b0c0ee91f4f Similar to tcp one. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net> 
Similar to tcp one.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
mib: add net to IP_INC_STATS_BH 2008-07-17T03:20:11+00:00 Pavel Emelyanov xemul@openvz.org 2008-07-17T03:20:11+00:00 7c73a6faffae0bfae70639113aecf06af666e714 Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net> 
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net: remove CVS keywords 2008-06-12T04:00:38+00:00 Adrian Bunk bunk@kernel.org 2008-06-11T05:46:50+00:00 0b040829952d84bf2a62526f0e24b624e0699447 This patch removes CVS keywords that weren't updated for a long time from comments. Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net> 
This patch removes CVS keywords that weren't updated for a long time
from comments.

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4: correct RFC 1122 section reference in comment 2008-05-08T08:11:04+00:00 J.H.M. Dassen (Ray) jdassen@debian.org 2008-05-08T08:11:04+00:00 c67fa02799bccca3d2e16582493da6d57812ec01 RFC 1122 does not have a section 3.1.2.2. The requirement to silently discard datagrams with a bad checksum is in section 3.2.1.2 instead. Addresses http://bugzilla.kernel.org/show_bug.cgi?id=10611 Signed-off-by: J.H.M. Dassen (Ray) <jdassen@debian.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: David S. Miller <davem@davemloft.net> 
RFC 1122 does not have a section 3.1.2.2. The requirement to silently
discard datagrams with a bad checksum is in section 3.2.1.2 instead.

Addresses http://bugzilla.kernel.org/show_bug.cgi?id=10611

Signed-off-by: J.H.M. Dassen (Ray) <jdassen@debian.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>