This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / net / sctp / ipv6.c

diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
index f657c4d..8765177 100644 (file)
--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
@@ -78,10 +78,7 @@
 
 #include <asm/uaccess.h>
 
-extern int sctp_inetaddr_event(struct notifier_block *, unsigned long, void *);
-static struct notifier_block sctp_inet6addr_notifier = {
-       .notifier_call = sctp_inetaddr_event,
-};
+extern struct notifier_block sctp_inetaddr_notifier;
 
 /* ICMP error handler. */
 void sctp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
@@ -464,7 +461,7 @@ static int sctp_v6_cmp_addr(const union sctp_addr *addr1,
                }
                return 0;
        }
-       if (!ipv6_addr_equal(&addr1->v6.sin6_addr, &addr2->v6.sin6_addr))
+       if (ipv6_addr_cmp(&addr1->v6.sin6_addr, &addr2->v6.sin6_addr))
                return 0;
        /* If this is a linklocal address, compare the scope_id. */
        if (ipv6_addr_type(&addr1->v6.sin6_addr) & IPV6_ADDR_LINKLOCAL) {
@@ -986,7 +983,7 @@ int sctp_v6_init(void)
        sctp_register_af(&sctp_ipv6_specific);
 
        /* Register notifier for inet6 address additions/deletions. */
-       register_inet6addr_notifier(&sctp_inet6addr_notifier);
+       register_inet6addr_notifier(&sctp_inetaddr_notifier);
        rc = 0;
 out:
        return rc;
@@ -1002,6 +999,6 @@ void sctp_v6_exit(void)
        inet6_del_protocol(&sctpv6_protocol, IPPROTO_SCTP);
        inet6_unregister_protosw(&sctpv6_seqpacket_protosw);
        inet6_unregister_protosw(&sctpv6_stream_protosw);
-       unregister_inet6addr_notifier(&sctp_inet6addr_notifier);
+       unregister_inet6addr_notifier(&sctp_inetaddr_notifier);
        sk_free_slab(&sctpv6_prot);
 }