Merge branch 'drm-nouveau-next' of git://git.freedesktop.org/git/nouveau/linux-2...

[pandora-kernel.git] / net / ipv4 / tcp_probe.c

diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
index 6211e21..85ee7eb 100644 (file)
--- a/net/ipv4/tcp_probe.c
+++ b/net/ipv4/tcp_probe.c
@@ -154,7 +154,7 @@ static int tcpprobe_sprint(char *tbuf, int n)
        struct timespec tv
                = ktime_to_timespec(ktime_sub(p->tstamp, tcp_probe.start));
 
-       return snprintf(tbuf, n,
+       return scnprintf(tbuf, n,
                        "%lu.%09lu %pI4:%u %pI4:%u %d %#x %#x %u %u %u %u\n",
                        (unsigned long) tv.tv_sec,
                        (unsigned long) tv.tv_nsec,
@@ -174,7 +174,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
                return -EINVAL;
 
        while (cnt < len) {
-               char tbuf[128];
+               char tbuf[164];
                int width;
 
                /* Wait for data in buffer */