sctp: Push struct net down into sctp_transport_init

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 8 insertions, 5 deletions

diff --git a/net/sctp/associola.c b/net/sctp/associola.c
index 6bcbecafe39..93a4513c85e 100644
--- a/net/sctp/associola.c
+++ b/net/sctp/associola.c
@@ -641,6 +641,7 @@ struct sctp_transport *sctp_assoc_add_peer(struct sctp_association *asoc,
                                            const gfp_t gfp,
                                            const int peer_state)
 {
+        struct net *net = sock_net(asoc->base.sk);
         struct sctp_transport *peer;
         struct sctp_sock *sp;
         unsigned short port;
@@ -674,7 +675,7 @@ struct sctp_transport *sctp_assoc_add_peer(struct sctp_association *asoc,
                 return peer;
         }
 
-        peer = sctp_transport_new(addr, gfp);
+        peer = sctp_transport_new(net, addr, gfp);
         if (!peer)
                 return NULL;
 
diff --git a/net/sctp/sm_statefuns.c b/net/sctp/sm_statefuns.c
index bee5e2c288d..ff2530c848b 100644
--- a/net/sctp/sm_statefuns.c
+++ b/net/sctp/sm_statefuns.c
@@ -5958,7 +5958,7 @@ static struct sctp_packet *sctp_ootb_pkt_new(struct net *net,
         }
 
         /* Make a transport for the bucket, Eliza... */
-        transport = sctp_transport_new(sctp_source(chunk), GFP_ATOMIC);
+        transport = sctp_transport_new(net, sctp_source(chunk), GFP_ATOMIC);
         if (!transport)
                 goto nomem;
 
diff --git a/net/sctp/transport.c b/net/sctp/transport.c
index c97472b248a..aada963c9d6 100644
--- a/net/sctp/transport.c
+++ b/net/sctp/transport.c
@@ -59,7 +59,8 @@
 /* 1st Level Abstractions.  */
 
 /* Initialize a new transport from provided memory.  */
-static struct sctp_transport *sctp_transport_init(struct sctp_transport *peer,
+static struct sctp_transport *sctp_transport_init(struct net *net,
+                                                  struct sctp_transport *peer,
                                                   const union sctp_addr *addr,
                                                   gfp_t gfp)
 {
@@ -109,7 +110,8 @@ 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,
+struct sctp_transport *sctp_transport_new(struct net *net,
+                                          const union sctp_addr *addr,
                                           gfp_t gfp)
 {
         struct sctp_transport *transport;
@@ -118,7 +120,7 @@ struct sctp_transport *sctp_transport_new(const union sctp_addr *addr,
         if (!transport)
                 goto fail;
 
-        if (!sctp_transport_init(transport, addr, gfp))
+        if (!sctp_transport_init(net, transport, addr, gfp))
                 goto fail_init;
 
         transport->malloced = 1;