From 7259afaa3c9c0844730b2aab816cd173250a8c54 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Tue, 21 Feb 2012 17:59:19 -0500
Subject: [PATCH] --- yaml --- r: 287979 b: refs/heads/master c:
 a5e7424d424f6398a198ead79d99e0a3c2f24ce8 h: refs/heads/master i:   287977:
 81161afcb9ed4e59c436000736cab56791dadb62   287975:
 5b1d055808b74aca2cbd2de5047574b473b61bf6 v: v3

---
 [refs]                | 2 +-
 trunk/net/ipv4/ping.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 424e415b53fa..a842ffd74c56 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 115c9b81928360d769a76c632bae62d15206a94a
+refs/heads/master: a5e7424d424f6398a198ead79d99e0a3c2f24ce8
diff --git a/trunk/net/ipv4/ping.c b/trunk/net/ipv4/ping.c
index aea5a199c37a..b072386cee21 100644
--- a/trunk/net/ipv4/ping.c
+++ b/trunk/net/ipv4/ping.c
@@ -630,6 +630,7 @@ static int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
 
 	pr_debug("ping_recvmsg(sk=%p,sk->num=%u)\n", isk, isk->inet_num);
 
+	err = -EOPNOTSUPP;
 	if (flags & MSG_OOB)
 		goto out;