diff options
| author | Eric Dumazet <edumazet@google.com> | 2015-03-18 14:05:35 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-18 22:00:34 -0400 |
| commit | d1e559d0b1b0d02f76a6bd5b768a99dc834ae926 (patch) | |
| tree | 283048c1921aeec1c2dfb25e72e6e67cddffcb23 /net/dccp/ipv6.c | |
| parent | 5b441f76f1b83591e8cd9d60ba1df3a2aacde27f (diff) | |
| download | linux-d1e559d0b1b0d02f76a6bd5b768a99dc834ae926.tar.gz linux-d1e559d0b1b0d02f76a6bd5b768a99dc834ae926.tar.bz2 linux-d1e559d0b1b0d02f76a6bd5b768a99dc834ae926.zip | |
inet: add IPv6 support to sk_ehashfn()
Intent is to converge IPv4 & IPv6 inet_hash functions to
factorize code.
IPv4 sockets initialize sk_rcv_saddr and sk_v6_daddr
in this patch, thanks to new sk_daddr_set() and sk_rcv_saddr_set()
helpers.
__inet6_hash can now use sk_ehashfn() instead of a private
inet6_sk_ehashfn() and will simply use __inet_hash() in a
following patch.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp/ipv6.c')
| -rw-r--r-- | net/dccp/ipv6.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c index d7e7c7b0a3f1..9216d173dd5f 100644 --- a/net/dccp/ipv6.c +++ b/net/dccp/ipv6.c @@ -470,11 +470,7 @@ static struct sock *dccp_v6_request_recv_sock(struct sock *sk, memcpy(newnp, np, sizeof(struct ipv6_pinfo)); - ipv6_addr_set_v4mapped(newinet->inet_daddr, &newsk->sk_v6_daddr); - - ipv6_addr_set_v4mapped(newinet->inet_saddr, &newnp->saddr); - - newsk->sk_v6_rcv_saddr = newnp->saddr; + newnp->saddr = newsk->sk_v6_rcv_saddr; inet_csk(newsk)->icsk_af_ops = &dccp_ipv6_mapped; newsk->sk_backlog_rcv = dccp_v4_do_rcv; @@ -917,9 +913,7 @@ static int dccp_v6_connect(struct sock *sk, struct sockaddr *uaddr, sk->sk_backlog_rcv = dccp_v6_do_rcv; goto failure; } - ipv6_addr_set_v4mapped(inet->inet_saddr, &np->saddr); - ipv6_addr_set_v4mapped(inet->inet_rcv_saddr, &sk->sk_v6_rcv_saddr); - + np->saddr = sk->sk_v6_rcv_saddr; return err; } |