From 97792d65e4925713babb0d745c26923908452c2c Mon Sep 17 00:00:00 2001 From: Thomas Graf Date: Sat, 20 Aug 2005 17:27:09 -0700 Subject: [PATCH] --- yaml --- r: 6393 b: refs/heads/master c: 9070683bdac59a3b26e2ce6dd0d05fbfcb3fc7d8 h: refs/heads/master i: 6391: 9cfd0bc81a1b390236cbbb46e0108eebd587abd9 v: v3 --- [refs] | 2 +- trunk/net/ipv4/ip_forward.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 306f916ab88e..5e0398da06ce 100644 --- 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 index 77094aac6c28..0923add122b4 100644 --- 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)