From: Thomas Graf <tgraf@suug.ch>
Date: Sun, 21 Aug 2005 00:27:09 +0000 (-0700)
Subject: [IPV4]: Remove some dead code from ip_forward()
X-Git-Tag: v2.6.14-rc1~1035^2~52
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9070683bdac59a3b26e2ce6dd0d05fbfcb3fc7d8;p=linux-2.6-omap-h63xx.git

[IPV4]: Remove some dead code from ip_forward()

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv4/ip_forward.c b/net/ipv4/ip_forward.c
index 77094aac6c2..0923add122b 100644
--- a/net/ipv4/ip_forward.c
+++ b/net/ipv4/ip_forward.c
@@ -76,16 +76,12 @@ int ip_forward(struct sk_buff *skb)
 	 *	that reaches zero, we must reply an ICMP control message telling
 	 *	that the packet's lifetime expired.
 	 */
-
-	iph = skb->nh.iph;
-
-	if (iph->ttl <= 1)
+	if (skb->nh.iph->ttl <= 1)
                 goto too_many_hops;
 
 	if (!xfrm4_route_forward(skb))
 		goto drop;
 
-	iph = skb->nh.iph;
 	rt = (struct rtable*)skb->dst;
 
 	if (opt->is_strictroute && rt->rt_dst != rt->rt_gateway)