diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-08-02 22:44:43 -0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-08-02 22:44:43 -0400 |
| commit | 3a97aeb5c199070f136c085f8b0f9338d19c4148 (patch) | |
| tree | 49cfc0939119a8a6db73c5522bc56902cbe4a8f6 /net/sctp/ipv6.c | |
| parent | d788d8056fd913defa48bd94f18dc53de98cd7a6 (diff) | |
| parent | 5f8f1c3c87e44f1bd0180cf19d0e7c83d062b4dc (diff) | |
Merge davem@master.kernel.org:/pub/scm/linux/kernel/git/vxy/lksctp-dev
Diffstat (limited to 'net/sctp/ipv6.c')
| -rw-r--r-- | net/sctp/ipv6.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c index 2c29394fd92e..f8aa23dda1c1 100644 --- a/net/sctp/ipv6.c +++ b/net/sctp/ipv6.c | |||
| @@ -641,6 +641,8 @@ static struct sock *sctp_v6_create_accept_sk(struct sock *sk, | |||
| 641 | newsctp6sk = (struct sctp6_sock *)newsk; | 641 | newsctp6sk = (struct sctp6_sock *)newsk; |
| 642 | inet_sk(newsk)->pinet6 = &newsctp6sk->inet6; | 642 | inet_sk(newsk)->pinet6 = &newsctp6sk->inet6; |
| 643 | 643 | ||
| 644 | sctp_sk(newsk)->v4mapped = sctp_sk(sk)->v4mapped; | ||
| 645 | |||
| 644 | newinet = inet_sk(newsk); | 646 | newinet = inet_sk(newsk); |
| 645 | newnp = inet6_sk(newsk); | 647 | newnp = inet6_sk(newsk); |
| 646 | 648 | ||