summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHagen Paul Pfeifer <hagen@jauu.net>2010-03-31 14:54:46 +0000
committerDavid S. Miller <davem@davemloft.net>2010-04-01 18:38:47 -0700
commitd4fc6dbb5ae51430e35b2005f6d68938861f8d8b (patch)
tree20a9c2a539787fb5c7dca8b6dad79e5750784073
parent430e55b11e9756bb7648fc1cdf5063e385cd6dec (diff)
downloadtalos-obmc-linux-d4fc6dbb5ae51430e35b2005f6d68938861f8d8b.tar.gz
talos-obmc-linux-d4fc6dbb5ae51430e35b2005f6d68938861f8d8b.zip
ipv4: remove redundant verification code
The check if error signaling is wanted (inet->recverr != 0) is done by the caller: raw.c:raw_err() and udp.c:__udp4_lib_err(), so there is no need to check this condition again. Signed-off-by: Hagen Paul Pfeifer <hagen@jauu.net> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv4/ip_sockglue.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index 644dc43a55de..f4b47acbf7b6 100644
--- a/net/ipv4/ip_sockglue.c
+++ b/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;
OpenPOWER on IntegriCloud