Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6932f119 authored by Ulrich Weber's avatar Ulrich Weber Committed by David S. Miller
Browse files

sctp: fix compile issue with disabled CONFIG_NET_NS 



struct seq_net_private has no struct net
if CONFIG_NET_NS is not enabled

Signed-off-by: default avatarUlrich Weber <ulrich.weber@sophos.com>
Reviewed-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2ea21492

net/sctp/proc.c

+3 −6
Original line number Diff line number Diff line
@@ -199,7 +199,6 @@ static void * sctp_eps_seq_next(struct seq_file *seq, void *v, loff_t *pos) 
/* Display sctp endpoints (/proc/net/sctp/eps). */

static int sctp_eps_seq_show(struct seq_file *seq, void *v)

{

	struct seq_net_private *priv = seq->private;

	struct sctp_hashbucket *head;

	struct sctp_ep_common *epb;

	struct sctp_endpoint *ep;
@@ -216,7 +215,7 @@ static int sctp_eps_seq_show(struct seq_file *seq, void *v) 
	sctp_for_each_hentry(epb, node, &head->chain) {

		ep = sctp_ep(epb);

		sk = epb->sk;

		if (!net_eq(sock_net(sk), priv->net))

		if (!net_eq(sock_net(sk), seq_file_net(seq)))

			continue;

		seq_printf(seq, "%8pK %8pK %-3d %-3d %-4d %-5d %5d %5lu ", ep, sk,

			   sctp_sk(sk)->type, sk->sk_state, hash,
@@ -307,7 +306,6 @@ static void * sctp_assocs_seq_next(struct seq_file *seq, void *v, loff_t *pos) 
/* Display sctp associations (/proc/net/sctp/assocs). */

static int sctp_assocs_seq_show(struct seq_file *seq, void *v)

{

	struct seq_net_private *priv = seq->private;

	struct sctp_hashbucket *head;

	struct sctp_ep_common *epb;

	struct sctp_association *assoc;
@@ -324,7 +322,7 @@ static int sctp_assocs_seq_show(struct seq_file *seq, void *v) 
	sctp_for_each_hentry(epb, node, &head->chain) {

		assoc = sctp_assoc(epb);

		sk = epb->sk;

		if (!net_eq(sock_net(sk), priv->net))

		if (!net_eq(sock_net(sk), seq_file_net(seq)))

			continue;

		seq_printf(seq,

			   "%8pK %8pK %-3d %-3d %-2d %-4d "
@@ -423,7 +421,6 @@ static void sctp_remaddr_seq_stop(struct seq_file *seq, void *v) 


static int sctp_remaddr_seq_show(struct seq_file *seq, void *v)

{

	struct seq_net_private *priv = seq->private;

	struct sctp_hashbucket *head;

	struct sctp_ep_common *epb;

	struct sctp_association *assoc;
@@ -438,7 +435,7 @@ static int sctp_remaddr_seq_show(struct seq_file *seq, void *v) 
	sctp_local_bh_disable();

	read_lock(&head->lock);

	sctp_for_each_hentry(epb, node, &head->chain) {

		if (!net_eq(sock_net(epb->sk), priv->net))

		if (!net_eq(sock_net(epb->sk), seq_file_net(seq)))

			continue;

		assoc = sctp_assoc(epb);

		list_for_each_entry(tsp, &assoc->peer.transport_addr_list,