Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / net / sctp / transport.c

diff --git a/net/sctp/transport.c b/net/sctp/transport.c
index d2f04ebe508103f436e7224ddbd132ff1fd815cf..268ddaf2dc0f6baa8ca2f5ccf0c6a7bf5b98d480 100644 (file)
--- a/net/sctp/transport.c
+++ b/net/sctp/transport.c
@@ -57,7 +57,7 @@
 /* Initialize a new transport from provided memory.  */
 static struct sctp_transport *sctp_transport_init(struct sctp_transport *peer,
                                                  const union sctp_addr *addr,
-                                                 unsigned int __nocast gfp)
+                                                 gfp_t gfp)
 {
        /* Copy in the address.  */
        peer->ipaddr = *addr;
@@ -122,7 +122,7 @@ static struct sctp_transport *sctp_transport_init(struct sctp_transport *peer,
 
 /* Allocate and initialize a new transport.  */
 struct sctp_transport *sctp_transport_new(const union sctp_addr *addr,
-                                         unsigned int __nocast gfp)
+                                         gfp_t gfp)
 {
         struct sctp_transport *transport;
 
@@ -261,7 +261,8 @@ void sctp_transport_route(struct sctp_transport *transport,
                 * association's active path for getsockname().
                 */ 
                if (asoc && (transport == asoc->peer.active_path))
-                       af->to_sk_saddr(&transport->saddr, asoc->base.sk);
+                       opt->pf->af->to_sk_saddr(&transport->saddr,
+                                                asoc->base.sk);
        } else
                transport->pmtu = SCTP_DEFAULT_MAXSEGMENT;
 }