summaryrefslogtreecommitdiffstats
path: root/net/ipv4/tcp_input.c
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2012-07-27 06:23:40 +0000
committerDavid S. Miller <davem@davemloft.net>2012-07-27 13:45:51 -0700
commit505fbcf035c245a1a42cd80184feecf61ee868dc (patch)
tree6931cf7a377b79e2bbb227f32f2f0856fe4d87a2 /net/ipv4/tcp_input.c
parentb1beb681cba5358f62e6187340660ade226a5fcc (diff)
downloadblackbird-op-linux-505fbcf035c245a1a42cd80184feecf61ee868dc.tar.gz
blackbird-op-linux-505fbcf035c245a1a42cd80184feecf61ee868dc.zip
ipv4: fix TCP early demux
commit 92101b3b2e317 (ipv4: Prepare for change of rt->rt_iif encoding.) invalidated TCP early demux, because rx_dst_ifindex is not properly initialized and checked. Also remove the use of inet_iif(skb) in favor or skb->skb_iif Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_input.c')
-rw-r--r--net/ipv4/tcp_input.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 3e07a64ca44e..aa659e825054 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -5603,6 +5603,7 @@ void tcp_finish_connect(struct sock *sk, struct sk_buff *skb)
if (skb != NULL) {
sk->sk_rx_dst = dst_clone(skb_dst(skb));
+ inet_sk(sk)->rx_dst_ifindex = skb->skb_iif;
security_inet_conn_established(sk, skb);
}
OpenPOWER on IntegriCloud