diff options
| author | Eric W. Biederman | 2012-08-06 10:43:06 +0200 |
|---|---|---|
| committer | David S. Miller | 2012-08-15 08:17:26 +0200 |
| commit | 2ce955035081112cf1590c961da8d94324142b5e (patch) | |
| tree | 1c9c9afdcac42e283a7383fa67842470753a0bb4 /net/sctp/input.c | |
| parent | sctp: Make the address lists per network namespace (diff) | |
| download | kernel-qcow2-linux-2ce955035081112cf1590c961da8d94324142b5e.tar.gz kernel-qcow2-linux-2ce955035081112cf1590c961da8d94324142b5e.tar.xz kernel-qcow2-linux-2ce955035081112cf1590c961da8d94324142b5e.zip | |
sctp: Make the ctl_sock per network namespace
- Kill sctp_get_ctl_sock, it is useless now.
- Pass struct net where needed so net->sctp.ctl_sock is accessible.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Vlad Yasevich <vyasevich@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp/input.c')
| -rw-r--r-- | net/sctp/input.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sctp/input.c b/net/sctp/input.c index a7e9a85b5acb..c9a0449bde53 100644 --- a/net/sctp/input.c +++ b/net/sctp/input.c @@ -204,7 +204,7 @@ int sctp_rcv(struct sk_buff *skb) sctp_endpoint_put(ep); ep = NULL; } - sk = sctp_get_ctl_sock(); + sk = net->sctp.ctl_sock; ep = sctp_sk(sk)->ep; sctp_endpoint_hold(ep); rcvr = &ep->base; @@ -795,7 +795,7 @@ static struct sctp_endpoint *__sctp_rcv_lookup_endpoint(struct net *net, goto hit; } - ep = sctp_sk((sctp_get_ctl_sock()))->ep; + ep = sctp_sk(net->sctp.ctl_sock)->ep; hit: sctp_endpoint_hold(ep); |