From 68c3dd38e8555079a3d726fd51262b0ddaa51af3 Mon Sep 17 00:00:00 2001
From: Hagen Paul Pfeifer <hagen@jauu.net>
Date: Wed, 31 Mar 2010 14:54:46 +0000
Subject: [PATCH] --- yaml --- r: 193908 b: refs/heads/master c:
 d4fc6dbb5ae51430e35b2005f6d68938861f8d8b h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/net/ipv4/ip_sockglue.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index b6bc3381796b..d5e95e7212a2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 430e55b11e9756bb7648fc1cdf5063e385cd6dec
+refs/heads/master: d4fc6dbb5ae51430e35b2005f6d68938861f8d8b
diff --git a/trunk/net/ipv4/ip_sockglue.c b/trunk/net/ipv4/ip_sockglue.c
index 644dc43a55de..f4b47acbf7b6 100644
--- a/trunk/net/ipv4/ip_sockglue.c
+++ b/trunk/net/ipv4/ip_sockglue.c
@@ -286,12 +286,8 @@ int ip_ra_control(struct sock *sk, unsigned char on,
 void ip_icmp_error(struct sock *sk, struct sk_buff *skb, int err,
 		   __be16 port, u32 info, u8 *payload)
 {
-	struct inet_sock *inet = inet_sk(sk);
 	struct sock_exterr_skb *serr;
 
-	if (!inet->recverr)
-		return;
-
 	skb = skb_clone(skb, GFP_ATOMIC);
 	if (!skb)
 		return;