---

yaml --- r: 41810 b: refs/heads/master c: 38a0314 h: refs/heads/master v: v3
git-mirror · Dec 3, 2006 · aed0c6c · aed0c6c
1 parent d429415
commit aed0c6c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 854d43a465cc8ba8e501320b3bc27359d909da2f
+refs/heads/master: 38a03145efcdbbcc60465fdffc0546208a52daf8
diff --git a/trunk/net/sctp/associola.c b/trunk/net/sctp/associola.c
@@ -666,13 +666,10 @@ void sctp_assoc_del_peer(struct sctp_association *asoc,
 	struct list_head	*pos;
 	struct list_head	*temp;
 	struct sctp_transport	*transport;
-	union sctp_addr tmp;
-
-	flip_to_n(&tmp, addr);
 
 	list_for_each_safe(pos, temp, &asoc->peer.transport_addr_list) {
 		transport = list_entry(pos, struct sctp_transport, transports);
-		if (sctp_cmp_addr_exact(&tmp, &transport->ipaddr)) {
+		if (sctp_cmp_addr_exact(addr, &transport->ipaddr)) {
 			/* Do book keeping for removing the peer and free it. */
 			sctp_assoc_rm_peer(asoc, transport);
 			break;
@@ -1051,7 +1048,7 @@ void sctp_assoc_update(struct sctp_association *asoc,
 	list_for_each_safe(pos, temp, &asoc->peer.transport_addr_list) {
 		trans = list_entry(pos, struct sctp_transport, transports);
 		if (!sctp_assoc_lookup_paddr(new, &trans->ipaddr_h))
-			sctp_assoc_del_peer(asoc, &trans->ipaddr_h);
+			sctp_assoc_del_peer(asoc, &trans->ipaddr);
 	}
 
 	/* If the case is A (association restart), use

diff --git a/trunk/net/sctp/sm_make_chunk.c b/trunk/net/sctp/sm_make_chunk.c
@@ -2463,7 +2463,7 @@ static __be16 sctp_process_asconf_param(struct sctp_association *asoc,
 		if (sctp_cmp_addr_exact(&tmp, &tmp_addr))
 			return SCTP_ERROR_DEL_SRC_IP;
 
-		sctp_assoc_del_peer(asoc, &addr);
+		sctp_assoc_del_peer(asoc, &tmp_addr);
 		break;
 	case SCTP_PARAM_SET_PRIMARY:
 		peer = sctp_assoc_lookup_paddr(asoc, &addr);

diff --git a/trunk/net/sctp/sm_sideeffect.c b/trunk/net/sctp/sm_sideeffect.c
@@ -835,7 +835,7 @@ static void sctp_cmd_del_non_primary(struct sctp_association *asoc)
 		t = list_entry(pos, struct sctp_transport, transports);
 		if (!sctp_cmp_addr_exact(&t->ipaddr,
 		                         &asoc->peer.primary_addr)) {
-			sctp_assoc_del_peer(asoc, &t->ipaddr_h);
+			sctp_assoc_del_peer(asoc, &t->ipaddr);
 		}
 	}