linux.git/net/ipv4, branch v3.3-rc4

tcp: fix tcp_shifted_skb() adjustment of lost_cnt_hint for FACK

2012-02-14T19:38:57+00:00

This commit ensures that lost_cnt_hint is correctly updated in
tcp_shifted_skb() for FACK TCP senders. The lost_cnt_hint adjustment
in tcp_sacktag_one() only applies to non-FACK senders, so FACK senders
need their own adjustment.

This applies the spirit of 1e5289e121372a3494402b1b131b41bfe1cf9b7f -
except now that the sequence range passed into tcp_sacktag_one() is
correct we need only have a special case adjustment for FACK.

Signed-off-by: Neal Cardwell 
Signed-off-by: David S. Miller

tcp: fix range tcp_shifted_skb() passes to tcp_sacktag_one()

2012-02-13T06:00:22+00:00

Fix the newly-SACKed range to be the range of newly-shifted bytes.

Previously - since 832d11c5cd076abc0aa1eaf7be96c81d1a59ce41 -
tcp_shifted_skb() incorrectly called tcp_sacktag_one() with the start
and end sequence numbers of the skb it passes in set to the range just
beyond the range that is newly-SACKed.

This commit also removes a special-case adjustment to lost_cnt_hint in
tcp_shifted_skb() since the pre-existing adjustment of lost_cnt_hint
in tcp_sacktag_one() now properly handles this things now that the
correct start sequence number is passed in.

Signed-off-by: Neal Cardwell 
Signed-off-by: David S. Miller

tcp: allow tcp_sacktag_one() to tag ranges not aligned with skbs

2012-02-13T06:00:21+00:00

This commit allows callers of tcp_sacktag_one() to pass in sequence
ranges that do not align with skb boundaries, as tcp_shifted_skb()
needs to do in an upcoming fix in this patch series.

In fact, now tcp_sacktag_one() does not need to depend on an input skb
at all, which makes its semantics and dependencies more clear.

Signed-off-by: Neal Cardwell 
Signed-off-by: David S. Miller

net: Don't proxy arp respond if iif == rt->dst.dev if private VLAN is disabled

2012-02-10T20:13:36+00:00

Commit 653241 (net: RFC3069, private VLAN proxy arp support) changed
the behavior of arp proxy to send arp replies back out on the interface
the request came in even if the private VLAN feature is disabled.

Previously we checked rt->dst.dev != skb->dev for in scenarios, when
proxy arp is enabled on for the netdevice and also when individual proxy
neighbour entries have been added.

This patch adds the check back for the pneigh_lookup() scenario.

Signed-off-by: Thomas Graf 
Acked-by: Jesper Dangaard Brouer 
Signed-off-by: David S. Miller

ipv4: Fix wrong order of ip_rt_get_source() and update iph->daddr.

2012-02-10T20:12:12+00:00

This patch fix a bug which introduced by commit ac8a4810 (ipv4: Save
nexthop address of LSRR/SSRR option to IPCB.).In that patch, we saved
the nexthop of SRR in ip_option->nexthop and update iph->daddr until
we get to ip_forward_options(), but we need to update it before
ip_rt_get_source(), otherwise we may get a wrong src.

Signed-off-by: Li Wei 
Signed-off-by: David S. Miller

net: Fix build regression when INET_UDP_DIAG=y and IPV6=m

2012-02-07T18:35:28+00:00

Tested-by: Anisse Astier 

Signed-off-by: David S. Miller

tcp_v4_send_reset: binding oif to iif in no sock case

2012-02-04T23:20:05+00:00

Binding RST packet outgoing interface to incoming interface
for tcp v4 when there is no socket associate with it.
when sk is not NULL, using sk->sk_bound_dev_if instead.
(suggested by Eric Dumazet).

This has few benefits:
1. tcp_v6_send_reset already did that.
2. This helps tcp connect with SO_BINDTODEVICE set. When
connection is lost, we still able to sending out RST using
same interface.
3. we are sending reply, it is most likely to be succeed
if iif is used

Signed-off-by: Shawn Lu 
Acked-by: Eric Dumazet 
Signed-off-by: David S. Miller

tcp: properly initialize tcp memory limits

2012-02-02T19:34:41+00:00

Commit 4acb4190 tries to fix the using uninitialized value
introduced by commit 3dc43e3,  but it would make the
per-socket memory limits too small.

This patch fixes this and also remove the redundant codes
introduced in 4acb4190.

Signed-off-by: Jason Wang 
Acked-by: Glauber Costa 
Signed-off-by: David S. Miller

net: Disambiguate kernel message

2012-02-01T19:41:50+00:00

Some of our machines were reporting:

TCP: too many of orphaned sockets

even when the number of orphaned sockets was well below the
limit.

We print a different message depending on whether we're out
of TCP memory or there are too many orphaned sockets.

Also move the check out of line and cleanup the messages
that were printed.

Signed-off-by: Arun Sharma 
Suggested-by: Mohan Srinivasan 
Cc: netdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: David Miller 
Cc: Glauber Costa 
Cc: Ingo Molnar 
Cc: Joe Perches 
Signed-off-by: David S. Miller

tcp: fix tcp_trim_head() to adjust segment count with skb MSS

2012-01-30T17:42:58+00:00

This commit fixes tcp_trim_head() to recalculate the number of
segments in the skb with the skb's existing MSS, so trimming the head
causes the skb segment count to be monotonically non-increasing - it
should stay the same or go down, but not increase.

Previously tcp_trim_head() used the current MSS of the connection. But
if there was a decrease in MSS between original transmission and ACK
(e.g. due to PMTUD), this could cause tcp_trim_head() to
counter-intuitively increase the segment count when trimming bytes off
the head of an skb. This violated assumptions in tcp_tso_acked() that
tcp_trim_head() only decreases the packet count, so that packets_acked
in tcp_tso_acked() could underflow, leading tcp_clean_rtx_queue() to
pass u32 pkts_acked values as large as 0xffffffff to
ca_ops->pkts_acked().

As an aside, if tcp_trim_head() had really wanted the skb to reflect
the current MSS, it should have called tcp_set_skb_tso_segs()
unconditionally, since a decrease in MSS would mean that a
single-packet skb should now be sliced into multiple segments.

Signed-off-by: Neal Cardwell 
Acked-by: Nandita Dukkipati 
Acked-by: Ilpo Järvinen 
Signed-off-by: David S. Miller