diff options
| author | David S. Miller <davem@davemloft.net> | 2015-03-14 15:05:15 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-14 15:05:15 -0400 |
| commit | 6922022af529829645908bb6d11233c6579a2c49 (patch) | |
| tree | d1fe4404bcee2e27b0a57cca62ee03f389e86f54 /net/ipv4/tcp_input.c | |
| parent | a3795208b9a9801a66b305395e9ebaae850eee03 (diff) | |
| parent | a4458343ac5986d010290915df6ab884afacbdb7 (diff) | |
Merge branch 'listener_refactor_part_9'
Eric Dumazet says:
====================
inet: tcp listener refactoring, part 9
This preliminary work pushes socket convergence a bit more:
1) request sock ir_iif is universally set
2) inet_diag can use common helpers to reduce LOC
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_input.c')
| -rw-r--r-- | net/ipv4/tcp_input.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index da61a8e75f68..717d437b6ce1 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -5967,6 +5967,9 @@ int tcp_conn_request(struct request_sock_ops *rsk_ops, tcp_openreq_init(req, &tmp_opt, skb, sk); write_pnet(&inet_rsk(req)->ireq_net, sock_net(sk)); + /* Note: tcp_v6_init_req() might override ir_iif for link locals */ + inet_rsk(req)->ir_iif = sk->sk_bound_dev_if; + af_ops->init_req(req, sk, skb); if (security_inet_conn_request(sk, skb, req)) |