Commit 89bf3450 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by David S. Miller

sctp: Push struct net down into sctp_transport_init

Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 55e26eb9
...@@ -1066,7 +1066,7 @@ struct sctp_transport { ...@@ -1066,7 +1066,7 @@ struct sctp_transport {
__u64 hb_nonce; __u64 hb_nonce;
}; };
struct sctp_transport *sctp_transport_new(const union sctp_addr *, struct sctp_transport *sctp_transport_new(struct net *, const union sctp_addr *,
gfp_t); gfp_t);
void sctp_transport_set_owner(struct sctp_transport *, void sctp_transport_set_owner(struct sctp_transport *,
struct sctp_association *); struct sctp_association *);
......
...@@ -641,6 +641,7 @@ struct sctp_transport *sctp_assoc_add_peer(struct sctp_association *asoc, ...@@ -641,6 +641,7 @@ struct sctp_transport *sctp_assoc_add_peer(struct sctp_association *asoc,
const gfp_t gfp, const gfp_t gfp,
const int peer_state) const int peer_state)
{ {
struct net *net = sock_net(asoc->base.sk);
struct sctp_transport *peer; struct sctp_transport *peer;
struct sctp_sock *sp; struct sctp_sock *sp;
unsigned short port; unsigned short port;
...@@ -674,7 +675,7 @@ struct sctp_transport *sctp_assoc_add_peer(struct sctp_association *asoc, ...@@ -674,7 +675,7 @@ struct sctp_transport *sctp_assoc_add_peer(struct sctp_association *asoc,
return peer; return peer;
} }
peer = sctp_transport_new(addr, gfp); peer = sctp_transport_new(net, addr, gfp);
if (!peer) if (!peer)
return NULL; return NULL;
......
...@@ -5958,7 +5958,7 @@ static struct sctp_packet *sctp_ootb_pkt_new(struct net *net, ...@@ -5958,7 +5958,7 @@ static struct sctp_packet *sctp_ootb_pkt_new(struct net *net,
} }
/* Make a transport for the bucket, Eliza... */ /* 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) if (!transport)
goto nomem; goto nomem;
......
...@@ -59,7 +59,8 @@ ...@@ -59,7 +59,8 @@
/* 1st Level Abstractions. */ /* 1st Level Abstractions. */
/* Initialize a new transport from provided memory. */ /* 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, const union sctp_addr *addr,
gfp_t gfp) gfp_t gfp)
{ {
...@@ -109,7 +110,8 @@ static struct sctp_transport *sctp_transport_init(struct sctp_transport *peer, ...@@ -109,7 +110,8 @@ static struct sctp_transport *sctp_transport_init(struct sctp_transport *peer,
} }
/* Allocate and initialize a new transport. */ /* 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) gfp_t gfp)
{ {
struct sctp_transport *transport; struct sctp_transport *transport;
...@@ -118,7 +120,7 @@ struct sctp_transport *sctp_transport_new(const union sctp_addr *addr, ...@@ -118,7 +120,7 @@ struct sctp_transport *sctp_transport_new(const union sctp_addr *addr,
if (!transport) if (!transport)
goto fail; goto fail;
if (!sctp_transport_init(transport, addr, gfp)) if (!sctp_transport_init(net, transport, addr, gfp))
goto fail_init; goto fail_init;
transport->malloced = 1; transport->malloced = 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment