diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2012-08-06 04:43:06 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-08-15 02:17:26 -0400 |
commit | 2ce955035081112cf1590c961da8d94324142b5e (patch) | |
tree | 1c9c9afdcac42e283a7383fa67842470753a0bb4 /net/sctp/input.c | |
parent | 4db67e808640e3934d82ce61ee8e2e89fd877ba8 (diff) |
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) | |||
204 | sctp_endpoint_put(ep); | 204 | sctp_endpoint_put(ep); |
205 | ep = NULL; | 205 | ep = NULL; |
206 | } | 206 | } |
207 | sk = sctp_get_ctl_sock(); | 207 | sk = net->sctp.ctl_sock; |
208 | ep = sctp_sk(sk)->ep; | 208 | ep = sctp_sk(sk)->ep; |
209 | sctp_endpoint_hold(ep); | 209 | sctp_endpoint_hold(ep); |
210 | rcvr = &ep->base; | 210 | rcvr = &ep->base; |
@@ -795,7 +795,7 @@ static struct sctp_endpoint *__sctp_rcv_lookup_endpoint(struct net *net, | |||
795 | goto hit; | 795 | goto hit; |
796 | } | 796 | } |
797 | 797 | ||
798 | ep = sctp_sk((sctp_get_ctl_sock()))->ep; | 798 | ep = sctp_sk(net->sctp.ctl_sock)->ep; |
799 | 799 | ||
800 | hit: | 800 | hit: |
801 | sctp_endpoint_hold(ep); | 801 | sctp_endpoint_hold(ep); |