summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorThomas Graf <tgraf@suug.ch>2005-08-21 02:27:09 +0200
committerDavid S. Miller <davem@sunset.davemloft.net>2005-08-30 01:03:06 +0200
commit9070683bdac59a3b26e2ce6dd0d05fbfcb3fc7d8 (patch)
tree5761421b50e94b6df9dd1353b03f472b489826e5 /net
parent[IPV4]: Avoid common branch mispredictions in ip_rcv_finish() (diff)
downloadlinux-9070683bdac59a3b26e2ce6dd0d05fbfcb3fc7d8.tar.xz
linux-9070683bdac59a3b26e2ce6dd0d05fbfcb3fc7d8.zip
[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>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/ip_forward.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/net/ipv4/ip_forward.c b/net/ipv4/ip_forward.c
index 77094aac6c28..0923add122b4 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)