linux-toradex.git/net/ipv4, branch tegra

ah: Don't return NET_XMIT_DROP on input.

2012-02-10T02:20:28+00:00

commit 4b90a603a1b21d63cf743cc833680cb195a729f6 upstream.

When the ahash driver returns -EBUSY, AH4/6 input functions return
NET_XMIT_DROP, presumably copied from the output code path.  But
returning transmit codes on input doesn't make a lot of sense.
Since NET_XMIT_DROP is a positive int, this gets interpreted as
the next header type (i.e., success).  As that can only end badly,
remove the check.

Signed-off-by: Nick Bowler 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman 
Signed-off-by: Varun Wadekar 
Change-Id: Ia5db571c5c73a87397fa10dfb668f85b7942f3b0
Reviewed-on: http://git-master/r/79659
Reviewed-by: Automatic_Commit_Validation_User

tcp: md5: using remote adress for md5 lookup in rst packet

2012-02-08T22:31:41+00:00

[ Upstream commit 8a622e71f58ec9f092fc99eacae0e6cf14f6e742 ]

md5 key is added in socket through remote address.
remote address should be used in finding md5 key when
sending out reset packet.

Signed-off-by: shawnlu 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman 
Signed-off-by: Varun Wadekar 
Change-Id: Ib092cc760c830540564414aa1d400e5eb78208f6
Reviewed-on: http://git-master/r/79697
Reviewed-by: Automatic_Commit_Validation_User

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

2012-02-08T22:31:34+00:00

[ Upstream commit 5b35e1e6e9ca651e6b291c96d1106043c9af314a ]

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 
Signed-off-by: Greg Kroah-Hartman 
Signed-off-by: Varun Wadekar 
Change-Id: I8e7359bbd561e78d0d9be4c3f871b22114504c8b
Reviewed-on: http://git-master/r/79696
Reviewed-by: Automatic_Commit_Validation_User

Merge branch 'linux-3.1.y' into android-tegra-nv-3.1

2012-01-16T10:02:21+00:00

Linux 3.1.9

Conflicts:
	Makefile

Change-Id: I22227ab33ba7ddaba8e6fe049393c58a83d73648
Signed-off-by: Varun Wadekar

igmp: Avoid zero delay when receiving odd mixture of IGMP queries

2012-01-12T19:33:41+00:00

commit a8c1f65c79cbbb2f7da782d4c9d15639a9b94b27 upstream.

Commit 5b7c84066733c5dfb0e4016d939757b38de189e4 ('ipv4: correct IGMP
behavior on v3 query during v2-compatibility mode') added yet another
case for query parsing, which can result in max_delay = 0.  Substitute
a value of 1, as in the usual v3 case.

Reported-by: Simon McVittie 
References: http://bugs.debian.org/654876
Signed-off-by: Ben Hutchings 
Signed-off-by: David S. Miller

ipv4: using prefetch requires including prefetch.h

2012-01-11T18:33:15+00:00

[ Upstream commit b9eda06f80b0db61a73bd87c6b0eb67d8aca55ad ]

Signed-off-by: Stephen Rothwell 
Acked-by: Eric Dumazet 
Acked-by: David Miller 
Signed-off-by: Linus Torvalds 
Signed-off-by: Greg Kroah-Hartman 
Change-Id: Ie3b22a8ecc595fd80bc3cd84d32e7d4ee7fe9ad8
Reviewed-on: http://git-master/r/74226
Reviewed-by: Varun Wadekar 
Tested-by: Varun Wadekar

ipv4: reintroduce route cache garbage collector

2012-01-11T18:33:00+00:00

[ Upstream commit 9f28a2fc0bd77511f649c0a788c7bf9a5fd04edb ]

Commit 2c8cec5c10b (ipv4: Cache learned PMTU information in inetpeer)
removed IP route cache garbage collector a bit too soon, as this gc was
responsible for expired routes cleanup, releasing their neighbour
reference.

As pointed out by Robert Gladewitz, recent kernels can fill and exhaust
their neighbour cache.

Reintroduce the garbage collection, since we'll have to wait our
neighbour lookups become refcount-less to not depend on this stuff.

Reported-by: Robert Gladewitz 
Signed-off-by: Eric Dumazet 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman 
Change-Id: I44f6d7e64fc76fe710b95afee4fee984c19d0e64
Reviewed-on: http://git-master/r/74225
Reviewed-by: Varun Wadekar 
Tested-by: Varun Wadekar

net: introduce DST_NOPEER dst flag

2012-01-11T18:32:00+00:00

[ Upstream commit e688a604807647c9450f9c12a7cb6d027150a895 ]

Chris Boot reported crashes occurring in ipv6_select_ident().

[  461.457562] RIP: 0010:[]  []
ipv6_select_ident+0x31/0xa7

[  461.578229] Call Trace:
[  461.580742] 
[  461.582870]  [] ? udp6_ufo_fragment+0x124/0x1a2
[  461.589054]  [] ? ipv6_gso_segment+0xc0/0x155
[  461.595140]  [] ? skb_gso_segment+0x208/0x28b
[  461.601198]  [] ? ipv6_confirm+0x146/0x15e
[nf_conntrack_ipv6]
[  461.608786]  [] ? nf_iterate+0x41/0x77
[  461.614227]  [] ? dev_hard_start_xmit+0x357/0x543
[  461.620659]  [] ? nf_hook_slow+0x73/0x111
[  461.626440]  [] ? br_parse_ip_options+0x19a/0x19a
[bridge]
[  461.633581]  [] ? dev_queue_xmit+0x3af/0x459
[  461.639577]  [] ? br_dev_queue_push_xmit+0x72/0x76
[bridge]
[  461.646887]  [] ? br_nf_post_routing+0x17d/0x18f
[bridge]
[  461.653997]  [] ? nf_iterate+0x41/0x77
[  461.659473]  [] ? br_flood+0xfa/0xfa [bridge]
[  461.665485]  [] ? nf_hook_slow+0x73/0x111
[  461.671234]  [] ? br_flood+0xfa/0xfa [bridge]
[  461.677299]  [] ?
nf_bridge_update_protocol+0x20/0x20 [bridge]
[  461.684891]  [] ? nf_ct_zone+0xa/0x17 [nf_conntrack]
[  461.691520]  [] ? br_flood+0xfa/0xfa [bridge]
[  461.697572]  [] ? NF_HOOK.constprop.8+0x3c/0x56
[bridge]
[  461.704616]  [] ?
nf_bridge_push_encap_header+0x1c/0x26 [bridge]
[  461.712329]  [] ? br_nf_forward_finish+0x8a/0x95
[bridge]
[  461.719490]  [] ?
nf_bridge_pull_encap_header+0x1c/0x27 [bridge]
[  461.727223]  [] ? br_nf_forward_ip+0x1c0/0x1d4 [bridge]
[  461.734292]  [] ? nf_iterate+0x41/0x77
[  461.739758]  [] ? __br_deliver+0xa0/0xa0 [bridge]
[  461.746203]  [] ? nf_hook_slow+0x73/0x111
[  461.751950]  [] ? __br_deliver+0xa0/0xa0 [bridge]
[  461.758378]  [] ? NF_HOOK.constprop.4+0x56/0x56
[bridge]

This is caused by bridge netfilter special dst_entry (fake_rtable), a
special shared entry, where attaching an inetpeer makes no sense.

Problem is present since commit 87c48fa3b46 (ipv6: make fragment
identifications less predictable)

Introduce DST_NOPEER dst flag and make sure ipv6_select_ident() and
__ip_select_ident() fallback to the 'no peer attached' handling.

Reported-by: Chris Boot 
Tested-by: Chris Boot 
Signed-off-by: Eric Dumazet 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman 
Change-Id: Id23270aae3214c26691f95922a63c70549232c22
Reviewed-on: http://git-master/r/74224
Reviewed-by: Varun Wadekar 
Tested-by: Varun Wadekar

ipv4: flush route cache after change accept_local

2012-01-11T18:31:07+00:00

[ Upstream commit d01ff0a049f749e0bf10a35bb23edd012718c8c2 ]

After reset ipv4_devconf->data[IPV4_DEVCONF_ACCEPT_LOCAL] to 0,
we should flush route cache, or it will continue receive packets with local
source address, which should be dropped.

Signed-off-by: Weiping Pan 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman 
Change-Id: I4e1a937bf13f758c7be089f614e7e84bdafcc0af
Reviewed-on: http://git-master/r/74222
Reviewed-by: Rohan Somvanshi 
Tested-by: Rohan Somvanshi

net: have ipconfig not wait if no dev is available

2012-01-11T18:23:05+00:00

[ Upstream commit cd7816d14953c8af910af5bb92f488b0b277e29d ]

previous commit 3fb72f1e6e6165c5f495e8dc11c5bbd14c73385c
makes IP-Config wait for carrier on at least one network device.

Before waiting (predefined value 120s), check that at least one device
was successfully brought up. Otherwise (e.g. buggy bootloader
which does not set the MAC address) there is no point in waiting
for carrier.

Cc: Micha Nelissen 
Cc: Holger Brunck 
Signed-off-by: Gerlando Falauto 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman 
Change-Id: I77fe0b97b750a3064e67330b131811edeebbc29b
Reviewed-on: http://git-master/r/74217
Reviewed-by: Varun Wadekar 
Tested-by: Varun Wadekar