---

yaml --- r: 6393 b: refs/heads/master c: 9070683 h: refs/heads/master i: 6391: 9cfd0bc v: v3
git-mirror · Aug 29, 2005 · 97792d6 · 97792d6
1 parent 49f7020
commit 97792d6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e192beaf5ef260a31e84a12c0a04eff2eec02ab
+refs/heads/master: 9070683bdac59a3b26e2ce6dd0d05fbfcb3fc7d8
diff --git a/trunk/net/ipv4/ip_forward.c b/trunk/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)