aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/ping.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv4/ping.c')
-rw-r--r--net/ipv4/ping.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
index 85a02a75ad83..5d740cccf69e 100644
--- a/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
@@ -855,16 +855,8 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
855 if (flags & MSG_OOB) 855 if (flags & MSG_OOB)
856 goto out; 856 goto out;
857 857
858 if (flags & MSG_ERRQUEUE) { 858 if (flags & MSG_ERRQUEUE)
859 if (family == AF_INET) { 859 return inet_recv_error(sk, msg, len, addr_len);
860 return ip_recv_error(sk, msg, len, addr_len);
861#if IS_ENABLED(CONFIG_IPV6)
862 } else if (family == AF_INET6) {
863 return pingv6_ops.ipv6_recv_error(sk, msg, len,
864 addr_len);
865#endif
866 }
867 }
868 860
869 skb = skb_recv_datagram(sk, flags, noblock, &err); 861 skb = skb_recv_datagram(sk, flags, noblock, &err);
870 if (!skb) 862 if (!skb)