diff options
| author | Mark Brown <broonie@kernel.org> | 2018-06-27 14:26:12 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-06-27 14:26:12 +0100 |
| commit | 1ce34dea91ae86bb18f493f72292df1bf6f66df7 (patch) | |
| tree | a9655fcdd65c2068cc04ffe3562a9c710dfa2145 /net/ipv4/udp.c | |
| parent | b0e4376b34cab1cbbd7ed399a1df787890336837 (diff) | |
| parent | a26899e0baa4de07caf97f5e4d7298240e98fd0e (diff) | |
Merge tag 'v4.14.52' into linux-linaro-lsk-v4.14lsk-v4.14-18.06
This is the 4.14.52 stable release
Diffstat (limited to 'net/ipv4/udp.c')
| -rw-r--r-- | net/ipv4/udp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index b0ad62bd38f7..5752bf7593dc 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -2720,7 +2720,7 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f, " %02X %08X:%08X %02X:%08lX %08X %5u %8d %lu %d %pK %d", bucket, src, srcp, dest, destp, sp->sk_state, sk_wmem_alloc_get(sp), - sk_rmem_alloc_get(sp), + udp_rqueue_get(sp), 0, 0L, 0, from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)), 0, sock_i_ino(sp), |