From 498e1645b964eb1504fcf660f2c586f7ff97321d Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@openvz.org>
Date: Sat, 12 Apr 2008 18:40:38 -0700
Subject: [PATCH] --- yaml --- r: 88309 b: refs/heads/master c:
 a40a7d15ba602b547f56b7b19e0282fe4fc3dee3 h: refs/heads/master i:   88307:
 91d0654d68e92eb99453251a0ee1f48c5f4e1473 v: v3

---
 [refs]                    | 2 +-
 trunk/net/sctp/ipv6.c     | 5 +++--
 trunk/net/sctp/protocol.c | 4 +++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 5873ed365653..817430816441 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab38fb04c9f8928cfaf6f4966633d783419906a1
+refs/heads/master: a40a7d15ba602b547f56b7b19e0282fe4fc3dee3
diff --git a/trunk/net/sctp/ipv6.c b/trunk/net/sctp/ipv6.c
index b1e05d719f9b..85f1495e0edc 100644
--- a/trunk/net/sctp/ipv6.c
+++ b/trunk/net/sctp/ipv6.c
@@ -110,8 +110,9 @@ static int sctp_inet6addr_event(struct notifier_block *this, unsigned long ev,
 		spin_lock_bh(&sctp_local_addr_lock);
 		list_for_each_entry_safe(addr, temp,
 					&sctp_local_addr_list, list) {
-			if (ipv6_addr_equal(&addr->a.v6.sin6_addr,
-					     &ifa->addr)) {
+			if (addr->a.sa.sa_family == AF_INET6 &&
+					ipv6_addr_equal(&addr->a.v6.sin6_addr,
+						&ifa->addr)) {
 				found = 1;
 				addr->valid = 0;
 				list_del_rcu(&addr->list);
diff --git a/trunk/net/sctp/protocol.c b/trunk/net/sctp/protocol.c
index f90091a1b9ce..c2dd65d9f38d 100644
--- a/trunk/net/sctp/protocol.c
+++ b/trunk/net/sctp/protocol.c
@@ -647,7 +647,9 @@ static int sctp_inetaddr_event(struct notifier_block *this, unsigned long ev,
 		spin_lock_bh(&sctp_local_addr_lock);
 		list_for_each_entry_safe(addr, temp,
 					&sctp_local_addr_list, list) {
-			if (addr->a.v4.sin_addr.s_addr == ifa->ifa_local) {
+			if (addr->a.sa.sa_family == AF_INET &&
+					addr->a.v4.sin_addr.s_addr ==
+					ifa->ifa_local) {
 				found = 1;
 				addr->valid = 0;
 				list_del_rcu(&addr->list);