vserver 1.9.5.x5

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

diff --git a/net/sctp/bind_addr.c b/net/sctp/bind_addr.c
index b484b4a..f90eadf 100644 (file)
--- a/net/sctp/bind_addr.c
+++ b/net/sctp/bind_addr.c
@@ -104,23 +104,6 @@ out:
        return error;
 }
 
-/* Create a new SCTP_bind_addr from nothing.  */
-struct sctp_bind_addr *sctp_bind_addr_new(int gfp)
-{
-       struct sctp_bind_addr *retval;
-
-       retval = t_new(struct sctp_bind_addr, gfp);
-       if (!retval)
-               goto nomem;
-
-       sctp_bind_addr_init(retval, 0);
-       retval->malloced = 1;
-       SCTP_DBG_OBJCNT_INC(bind_addr);
-
-nomem:
-       return retval;
-}
-
 /* Initialize the SCTP_bind_addr structure for either an endpoint or
  * an association.
  */
@@ -310,7 +293,7 @@ int sctp_raw_to_bind_addrs(struct sctp_bind_addr *bp, __u8 *raw_addr_list,
 /* Does this contain a specified address?  Allow wildcarding. */
 int sctp_bind_addr_match(struct sctp_bind_addr *bp, 
                         const union sctp_addr *addr,
-                        struct sctp_opt *opt)
+                        struct sctp_sock *opt)
 {
        struct sctp_sockaddr_entry *laddr;
        struct list_head *pos;
@@ -330,7 +313,7 @@ int sctp_bind_addr_match(struct sctp_bind_addr *bp,
 union sctp_addr *sctp_find_unmatch_addr(struct sctp_bind_addr  *bp,
                                        const union sctp_addr   *addrs,
                                        int                     addrcnt,
-                                       struct sctp_opt         *opt)
+                                       struct sctp_sock        *opt)
 {
        struct sctp_sockaddr_entry      *laddr;
        union sctp_addr                 *addr;