diff options
| author | Thomas Graf <tgraf@suug.ch> | 2005-08-20 20:27:09 -0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2005-08-29 19:03:06 -0400 |
| commit | 9070683bdac59a3b26e2ce6dd0d05fbfcb3fc7d8 (patch) | |
| tree | 5761421b50e94b6df9dd1353b03f472b489826e5 /net/ipv4 | |
| parent | 3e192beaf5ef260a31e84a12c0a04eff2eec02ab (diff) | |
[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/ipv4')
| -rw-r--r-- | net/ipv4/ip_forward.c | 6 |
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) | |||
| 76 | * that reaches zero, we must reply an ICMP control message telling | 76 | * that reaches zero, we must reply an ICMP control message telling |
| 77 | * that the packet's lifetime expired. | 77 | * that the packet's lifetime expired. |
| 78 | */ | 78 | */ |
| 79 | 79 | if (skb->nh.iph->ttl <= 1) | |
| 80 | iph = skb->nh.iph; | ||
| 81 | |||
| 82 | if (iph->ttl <= 1) | ||
| 83 | goto too_many_hops; | 80 | goto too_many_hops; |
| 84 | 81 | ||
| 85 | if (!xfrm4_route_forward(skb)) | 82 | if (!xfrm4_route_forward(skb)) |
| 86 | goto drop; | 83 | goto drop; |
| 87 | 84 | ||
| 88 | iph = skb->nh.iph; | ||
| 89 | rt = (struct rtable*)skb->dst; | 85 | rt = (struct rtable*)skb->dst; |
| 90 | 86 | ||
| 91 | if (opt->is_strictroute && rt->rt_dst != rt->rt_gateway) | 87 | if (opt->is_strictroute && rt->rt_dst != rt->rt_gateway) |