1 files changed, 9 insertions, 6 deletions

diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
index b2c2366676a..6a72a58cde5 100644
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@ -120,6 +120,7 @@ extern int sctp_copy_local_addr_list(struct sctp_bind_addr *,
                                      int flags);
 extern struct sctp_pf *sctp_get_pf_specific(sa_family_t family);
 extern int sctp_register_pf(struct sctp_pf *, sa_family_t);
+extern void sctp_addr_wq_mgmt(struct sctp_sockaddr_entry *, int);
 
 /*
  * sctp/socket.c
@@ -134,6 +135,7 @@ void sctp_sock_rfree(struct sk_buff *skb);
 void sctp_copy_sock(struct sock *newsk, struct sock *sk,
                     struct sctp_association *asoc);
 extern struct percpu_counter sctp_sockets_allocated;
+extern int sctp_asconf_mgmt(struct sctp_sock *, struct sctp_sockaddr_entry *);
 
 /*
  * sctp/primitive.c
@@ -285,20 +287,21 @@ do {							\
                 pr_cont(fmt, ##args);                   \
 } while (0)
 #define SCTP_DEBUG_PRINTK_IPADDR(fmt_lead, fmt_trail,                   \
-                                 args_lead, saddr, args_trail...)       \
+                                 args_lead, addr, args_trail...)        \
 do {                                                                    \
+        const union sctp_addr *_addr = (addr);                          \
         if (sctp_debug_flag) {                                          \
-                if (saddr->sa.sa_family == AF_INET6) {                  \
+                if (_addr->sa.sa_family == AF_INET6) {                  \
                         printk(KERN_DEBUG                               \
                                pr_fmt(fmt_lead "%pI6" fmt_trail),       \
                                args_lead,                               \
-                               &saddr->v6.sin6_addr,                    \
+                               &_addr->v6.sin6_addr,                    \
                                args_trail);                             \
                 } else {                                                \
                         printk(KERN_DEBUG                               \
                                pr_fmt(fmt_lead "%pI4" fmt_trail),       \
                                args_lead,                               \
-                               &saddr->v4.sin_addr.s_addr,              \
+                               &_addr->v4.sin_addr.s_addr,              \
                                args_trail);                             \
                 }                                                       \
         }                                                               \
@@ -598,7 +601,7 @@ static inline int ipver2af(__u8 ipver)
                 return AF_INET6;
         default:
                 return 0;
-        };
+        }
 }
 
 /* Convert from an address parameter type to an address family.  */
@@ -611,7 +614,7 @@ static inline int param_type2af(__be16 type)
                 return AF_INET6;
         default:
                 return 0;
-        };
+        }
 }
 
 /* Perform some sanity checks. */