linux-toradex.git/net/ipv4, branch v2.6.22.5

Netfilter: Fix logging regression

2007-08-09T21:27:46+00:00

[NETFILTER]: Fix logging regression

Loading one of the LOG target fails if a different target has already
registered itself as backend for the same family. This can affect the
ipt_LOG and ipt_ULOG modules when both are loaded.

Reported and tested by: 
Upstream-commit: 7e2acc7e

Signed-off-by: Patrick McHardy 
Signed-off-by: Greg Kroah-Hartman

nf_conntrack: don't track locally generated special ICMP error

2007-08-09T21:27:46+00:00

[NETFILTER]: nf_conntrack: don't track locally generated special ICMP error

The conntrack assigned to locally generated ICMP error is usually the one
assigned to the original packet which has caused the error. But if
the original packet is handled as invalid by nf_conntrack, no conntrack
is assigned to the original packet. Then nf_ct_attach() cannot assign
any conntrack to the ICMP error packet. In that case the current
nf_conntrack_icmp assigns appropriate conntrack to it. But the current
code mistakes the direction of the packet. As a result, NAT code mistakes
the address to be mangled.

To fix the bug, this changes nf_conntrack_icmp not to assign conntrack
to such ICMP error. Actually no address is necessary to be mangled
in this case.

Spotted by Jordan Russell.

Signed-off-by: Yasuyuki Kozakai 

Upstream commit ID: 130e7a83d7ec8c5c673225e0fa8ea37b1ed507a5

Signed-off-by: Patrick McHardy 
Signed-off-by: Greg Kroah-Hartman

TCP FRTO retransmit bug fix

2007-08-09T21:27:25+00:00

[TCP]: Verify the presence of RETRANS bit when leaving FRTO

For yet unknown reason, something cleared SACKED_RETRANS bit
underneath FRTO.

Signed-off-by: Ilpo Järvinen 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

[TCP] tcp_read_sock: Allow recv_actor() return return negative error value.

2007-06-24T06:07:50+00:00

tcp_read_sock() currently assumes that the recv_actor() only returns
number of bytes copied. For network splice receive, we may have to
return an error in some cases. So allow the actor to return a negative
error value.

Signed-off-by: Jens Axboe 
Signed-off-by: David S. Miller

[IPVS]: Fix state variable on failure to start ipvs threads

2007-06-19T05:33:20+00:00

ip_vs currently fails to reset its ip_vs_sync_state variable if the
sync thread fails to start properly.  The result is that the kernel
will report a running daemon when their actuall is none.

If you issue the following commands:

1. ipvsadm --start-daemon master --mcast-interface bla
2. ipvsadm -L --daemon
3. ipvsadm --stop-daemon master

Assuming that bla is not an actual interface, step 2 should return no
data, but instead returns:

$ ipvsadm -L --daemon
master sync daemon (mcast=bla, syncid=0)

Signed-off-by: Neil Horman 
Signed-off-by: David S. Miller

[TCP]: Fix logic breakage due to DSACK separation

2007-06-15T22:14:04+00:00

Commit 6f74651ae626ec672028587bc700538076dfbefb is found guilty
of breaking DSACK counting, which should be done only for the
SACK block reported by the DSACK instead of every SACK block
that is received along with DSACK information.

Signed-off-by: Ilpo Järvinen 
Signed-off-by: David S. Miller

[TCP]: Congestion control API RTT sampling fix

2007-06-15T22:08:43+00:00

Commit 164891aadf1721fca4dce473bb0e0998181537c6 broke RTT
sampling of congestion control modules. Inaccurate timestamps
could be fed to them without providing any way for them to
identify such cases. Previously RTT sampler was called only if
FLAG_RETRANS_DATA_ACKED was not set filtering inaccurate
timestamps nicely. In addition, the new behavior could give an
invalid timestamp (zero) to RTT sampler if only skbs with
TCPCB_RETRANS were ACKed. This solves both problems.

Signed-off-by: Ilpo Järvinen 
Signed-off-by: David S. Miller

[TCP]: Add missing break to TCP option parsing code

2007-06-14T19:58:26+00:00

This flaw does not affect any behavior (currently).

Signed-off-by: Ilpo Järvinen 
Signed-off-by: David S. Miller

[TCP]: Set initial_ssthresh default to zero in Cubic and BIC.

2007-06-13T08:03:53+00:00

Because of the current default of 100, Cubic and BIC perform very
poorly compared to standard Reno.

In the worst case, this change makes Cubic and BIC as aggressive as
Reno.  So this change should be very safe.

Signed-off-by: David S. Miller

[TCP]: Fix left_out setting during FRTO

2007-06-12T23:16:44+00:00

Without FRTO, the tcp_try_to_open is never called with
lost_out > 0 (see tcp_time_to_recover). However, when FRTO is
enabled, the !tp->lost condition is not used until end of FRTO
because that way TCP avoids premature entry to fast recovery
during FRTO.

Signed-off-by: Ilpo Järvinen 
Signed-off-by: David S. Miller