Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / net / sctp / proc.c

diff --git a/net/sctp/proc.c b/net/sctp/proc.c
index ab3bba8cb0a80542df0f2839874886a179ac1bbd..4e45ee35d0db149582c4435462baf253647d7774 100644 (file)
--- a/net/sctp/proc.c
+++ b/net/sctp/proc.c
@@ -295,7 +295,8 @@ static void * sctp_assocs_seq_start(struct seq_file *seq, loff_t *pos)
                seq_printf(seq, " ASSOC     SOCK   STY SST ST HBKT "
                                "ASSOC-ID TX_QUEUE RX_QUEUE UID INODE LPORT "
                                "RPORT LADDRS <-> RADDRS "
-                               "HBINT INS OUTS MAXRT T1X T2X RTXC\n");
+                               "HBINT INS OUTS MAXRT T1X T2X RTXC "
+                               "wmema wmemq sndbuf rcvbuf\n");
 
        return (void *)pos;
 }
@@ -349,11 +350,16 @@ static int sctp_assocs_seq_show(struct seq_file *seq, void *v)
                sctp_seq_dump_local_addrs(seq, epb);
                seq_printf(seq, "<-> ");
                sctp_seq_dump_remote_addrs(seq, assoc);
-               seq_printf(seq, "\t%8lu %5d %5d %4d %4d %4d %8d ",
+               seq_printf(seq, "\t%8lu %5d %5d %4d %4d %4d %8d "
+                          "%8d %8d %8d %8d",
                        assoc->hbinterval, assoc->c.sinit_max_instreams,
                        assoc->c.sinit_num_ostreams, assoc->max_retrans,
                        assoc->init_retries, assoc->shutdown_retries,
-                       assoc->rtx_data_chunks);
+                       assoc->rtx_data_chunks,
+                       atomic_read(&sk->sk_wmem_alloc),
+                       sk->sk_wmem_queued,
+                       sk->sk_sndbuf,
+                       sk->sk_rcvbuf);
                seq_printf(seq, "\n");
        }
        read_unlock(&head->lock);