[SCTP]: Remove timeouts[] array from sctp_endpoint.

[safe/jmp/linux-2.6] / net / sctp / protocol.c

diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c
index f01d1c9..dc9dff3 100644 (file)
--- a/net/sctp/protocol.c
+++ b/net/sctp/protocol.c
@@ -219,7 +219,7 @@ static void sctp_free_local_addr_list(void)
 
 /* Copy the local addresses which are valid for 'scope' into 'bp'.  */
 int sctp_copy_local_addr_list(struct sctp_bind_addr *bp, sctp_scope_t scope,
-                             unsigned int __nocast gfp, int copy_flags)
+                             gfp_t gfp, int copy_flags)
 {
        struct sctp_sockaddr_entry *addr;
        int error = 0;
@@ -530,6 +530,9 @@ static void sctp_v4_get_saddr(struct sctp_association *asoc,
 {
        struct rtable *rt = (struct rtable *)dst;
 
+       if (!asoc)
+               return;
+
        if (rt) {
                saddr->v4.sin_family = AF_INET;
                saddr->v4.sin_port = asoc->base.bind_addr.port;