Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / include / net / sctp / sctp.h

diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
index 8f241216f46bdb23e29425b58b308bea5a6b5092..e673b2c984e931c9a80d7c5e677bfdc1984fa4c3 100644 (file)
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@ -175,6 +175,8 @@ void sctp_icmp_frag_needed(struct sock *, struct sctp_association *,
 void sctp_icmp_proto_unreachable(struct sock *sk,
                                 struct sctp_association *asoc,
                                 struct sctp_transport *t);
+void sctp_backlog_migrate(struct sctp_association *assoc,
+                         struct sock *oldsk, struct sock *newsk);
 
 /*
  *  Section:  Macros, externs, and inlines
@@ -225,13 +227,13 @@ extern int sctp_debug_flag;
        if (sctp_debug_flag) { \
                if (saddr->sa.sa_family == AF_INET6) { \
                        printk(KERN_DEBUG \
-                              lead "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x" trail, \
+                              lead NIP6_FMT trail, \
                               leadparm, \
                               NIP6(saddr->v6.sin6_addr), \
                               otherparms); \
                } else { \
                        printk(KERN_DEBUG \
-                              lead "%u.%u.%u.%u" trail, \
+                              lead NIPQUAD_FMT trail, \
                               leadparm, \
                               NIPQUAD(saddr->v4.sin_addr.s_addr), \
                               otherparms); \