aboutsummaryrefslogtreecommitdiffstats
path: root/net/sctp
diff options
context:
space:
mode:
authorUlrich Weber <ulrich.weber@sophos.com>2012-08-15 21:24:49 -0400
committerDavid S. Miller <davem@davemloft.net>2012-08-16 16:36:29 -0400
commit6932f119bd71a315a1945276377277d91c4a71c6 (patch)
treecd6ec2bf46e036d7f1f67ff4544a295e06d04bee /net/sctp
parent2ea214929d601a9308e47c3d380e50315963ce42 (diff)
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: Ulrich Weber <ulrich.weber@sophos.com> Reviewed-by: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp')
-rw-r--r--net/sctp/proc.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/net/sctp/proc.c b/net/sctp/proc.c
index 3e62ee55228f..d9cb2ab149fe 100644
--- a/net/sctp/proc.c
+++ b/net/sctp/proc.c
@@ -199,7 +199,6 @@ static void * sctp_eps_seq_next(struct seq_file *seq, void *v, loff_t *pos)
199/* Display sctp endpoints (/proc/net/sctp/eps). */ 199/* Display sctp endpoints (/proc/net/sctp/eps). */
200static int sctp_eps_seq_show(struct seq_file *seq, void *v) 200static int sctp_eps_seq_show(struct seq_file *seq, void *v)
201{ 201{
202 struct seq_net_private *priv = seq->private;
203 struct sctp_hashbucket *head; 202 struct sctp_hashbucket *head;
204 struct sctp_ep_common *epb; 203 struct sctp_ep_common *epb;
205 struct sctp_endpoint *ep; 204 struct sctp_endpoint *ep;
@@ -216,7 +215,7 @@ static int sctp_eps_seq_show(struct seq_file *seq, void *v)
216 sctp_for_each_hentry(epb, node, &head->chain) { 215 sctp_for_each_hentry(epb, node, &head->chain) {
217 ep = sctp_ep(epb); 216 ep = sctp_ep(epb);
218 sk = epb->sk; 217 sk = epb->sk;
219 if (!net_eq(sock_net(sk), priv->net)) 218 if (!net_eq(sock_net(sk), seq_file_net(seq)))
220 continue; 219 continue;
221 seq_printf(seq, "%8pK %8pK %-3d %-3d %-4d %-5d %5d %5lu ", ep, sk, 220 seq_printf(seq, "%8pK %8pK %-3d %-3d %-4d %-5d %5d %5lu ", ep, sk,
222 sctp_sk(sk)->type, sk->sk_state, hash, 221 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)
307/* Display sctp associations (/proc/net/sctp/assocs). */ 306/* Display sctp associations (/proc/net/sctp/assocs). */
308static int sctp_assocs_seq_show(struct seq_file *seq, void *v) 307static int sctp_assocs_seq_show(struct seq_file *seq, void *v)
309{ 308{
310 struct seq_net_private *priv = seq->private;
311 struct sctp_hashbucket *head; 309 struct sctp_hashbucket *head;
312 struct sctp_ep_common *epb; 310 struct sctp_ep_common *epb;
313 struct sctp_association *assoc; 311 struct sctp_association *assoc;
@@ -324,7 +322,7 @@ static int sctp_assocs_seq_show(struct seq_file *seq, void *v)
324 sctp_for_each_hentry(epb, node, &head->chain) { 322 sctp_for_each_hentry(epb, node, &head->chain) {
325 assoc = sctp_assoc(epb); 323 assoc = sctp_assoc(epb);
326 sk = epb->sk; 324 sk = epb->sk;
327 if (!net_eq(sock_net(sk), priv->net)) 325 if (!net_eq(sock_net(sk), seq_file_net(seq)))
328 continue; 326 continue;
329 seq_printf(seq, 327 seq_printf(seq,
330 "%8pK %8pK %-3d %-3d %-2d %-4d " 328 "%8pK %8pK %-3d %-3d %-2d %-4d "
@@ -423,7 +421,6 @@ static void sctp_remaddr_seq_stop(struct seq_file *seq, void *v)
423 421
424static int sctp_remaddr_seq_show(struct seq_file *seq, void *v) 422static int sctp_remaddr_seq_show(struct seq_file *seq, void *v)
425{ 423{
426 struct seq_net_private *priv = seq->private;
427 struct sctp_hashbucket *head; 424 struct sctp_hashbucket *head;
428 struct sctp_ep_common *epb; 425 struct sctp_ep_common *epb;
429 struct sctp_association *assoc; 426 struct sctp_association *assoc;
@@ -438,7 +435,7 @@ static int sctp_remaddr_seq_show(struct seq_file *seq, void *v)
438 sctp_local_bh_disable(); 435 sctp_local_bh_disable();
439 read_lock(&head->lock); 436 read_lock(&head->lock);
440 sctp_for_each_hentry(epb, node, &head->chain) { 437 sctp_for_each_hentry(epb, node, &head->chain) {
441 if (!net_eq(sock_net(epb->sk), priv->net)) 438 if (!net_eq(sock_net(epb->sk), seq_file_net(seq)))
442 continue; 439 continue;
443 assoc = sctp_assoc(epb); 440 assoc = sctp_assoc(epb);
444 list_for_each_entry(tsp, &assoc->peer.transport_addr_list, 441 list_for_each_entry(tsp, &assoc->peer.transport_addr_list,