From 6ae654c266b6a02a8497b49969722874283356dd Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Fri, 9 May 2008 15:11:17 -0700 Subject: [PATCH] --- yaml --- r: 96538 b: refs/heads/master c: 6e40a915de82e00d18f75941e531b40c4e0d94c4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/sctp/sm_make_chunk.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9bfd0c058ba1..4a09ee3ce59e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f9af857489cc19ee3acd0d5248dca7d243e353a5 +refs/heads/master: 6e40a915de82e00d18f75941e531b40c4e0d94c4 diff --git a/trunk/net/sctp/sm_make_chunk.c b/trunk/net/sctp/sm_make_chunk.c index 81b606424e12..69a464f1d2b9 100644 --- a/trunk/net/sctp/sm_make_chunk.c +++ b/trunk/net/sctp/sm_make_chunk.c @@ -2418,7 +2418,8 @@ static int sctp_process_param(struct sctp_association *asoc, break; case SCTP_PARAM_IPV6_ADDRESS: - asoc->peer.ipv6_address = 1; + if (PF_INET6 == asoc->base.sk->sk_family) + asoc->peer.ipv6_address = 1; break; case SCTP_PARAM_HOST_NAME_ADDRESS: