aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeil Horman <nhorman@tuxdriver.com>2008-04-12 21:53:48 -0400
committerDavid S. Miller <davem@davemloft.net>2008-04-12 21:53:48 -0400
commit30e935600776b45db38238355f0de2b8f72b3847 (patch)
tree280193cf879f96d3905536dcd4182a288bfb3477
parentc0b8c32b1c96afc9b32b717927330025cc1c501e (diff)
[SCTP]: Correct /proc/net/assocs formatting error
Recently I posted a patch to add some informational items to /proc/net/sctp/assocs. All the information is correct, but because of how the seqfile show operation is laid out, some of the formatting is backwards. This patch corrects that formatting, so that the new information appears at the end of each line, rather than in the middle. Signed-off-by: Neil Horman <nhorman@tuxdriver.com> Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/sctp/proc.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/net/sctp/proc.c b/net/sctp/proc.c
index ddca90e5e3a5..99062f5f42e3 100644
--- a/net/sctp/proc.c
+++ b/net/sctp/proc.c
@@ -322,8 +322,7 @@ static int sctp_assocs_seq_show(struct seq_file *seq, void *v)
322 sk = epb->sk; 322 sk = epb->sk;
323 seq_printf(seq, 323 seq_printf(seq,
324 "%8p %8p %-3d %-3d %-2d %-4d " 324 "%8p %8p %-3d %-3d %-2d %-4d "
325 "%4d %8d %8d %7d %5lu %-5d %5d " 325 "%4d %8d %8d %7d %5lu %-5d %5d ",
326 "%8lu %5d %5d %4d %4d %4d %8d ",
327 assoc, sk, sctp_sk(sk)->type, sk->sk_state, 326 assoc, sk, sctp_sk(sk)->type, sk->sk_state,
328 assoc->state, hash, 327 assoc->state, hash,
329 assoc->assoc_id, 328 assoc->assoc_id,
@@ -331,15 +330,16 @@ static int sctp_assocs_seq_show(struct seq_file *seq, void *v)
331 atomic_read(&assoc->rmem_alloc), 330 atomic_read(&assoc->rmem_alloc),
332 sock_i_uid(sk), sock_i_ino(sk), 331 sock_i_uid(sk), sock_i_ino(sk),
333 epb->bind_addr.port, 332 epb->bind_addr.port,
334 assoc->peer.port, 333 assoc->peer.port);
335 assoc->hbinterval, assoc->c.sinit_max_instreams,
336 assoc->c.sinit_num_ostreams, assoc->max_retrans,
337 assoc->init_retries, assoc->shutdown_retries,
338 assoc->rtx_data_chunks);
339 seq_printf(seq, " "); 334 seq_printf(seq, " ");
340 sctp_seq_dump_local_addrs(seq, epb); 335 sctp_seq_dump_local_addrs(seq, epb);
341 seq_printf(seq, "<-> "); 336 seq_printf(seq, "<-> ");
342 sctp_seq_dump_remote_addrs(seq, assoc); 337 sctp_seq_dump_remote_addrs(seq, assoc);
338 seq_printf(seq, "\t%8lu %5d %5d %4d %4d %4d %8d ",
339 assoc->hbinterval, assoc->c.sinit_max_instreams,
340 assoc->c.sinit_num_ostreams, assoc->max_retrans,
341 assoc->init_retries, assoc->shutdown_retries,
342 assoc->rtx_data_chunks);
343 seq_printf(seq, "\n"); 343 seq_printf(seq, "\n");
344 } 344 }
345 read_unlock(&head->lock); 345 read_unlock(&head->lock);