---

yaml --- r: 96538 b: refs/heads/master c: 6e40a91 h: refs/heads/master v: v3
git-mirror · May 12, 2008 · 6ae654c · 6ae654c
1 parent 9ca1d73
commit 6ae654c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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: