summaryrefslogtreecommitdiffstats
path: root/net/ipv6/ip6_tunnel.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-07-12 00:41:25 -0700
committerDavid S. Miller <davem@davemloft.net>2012-07-12 00:41:25 -0700
commit1ed5c48f231cd00eac0b3d2350ac61e3c825063e (patch)
treea2ddd1e4c432d7300396814320608ee946030fc1 /net/ipv6/ip6_tunnel.c
parentb587ee3ba21f58b7770a132e6bca5c6658ac5095 (diff)
net: Remove checks for dst_ops->redirect being NULL.
No longer necessary. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6_tunnel.c')
-rw-r--r--net/ipv6/ip6_tunnel.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index 0b5b60ec6f4..61d10659729 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -611,10 +611,8 @@ ip4ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
skb_dst(skb2)->ops->update_pmtu(skb_dst(skb2), rel_info);
}
- if (rel_type == ICMP_REDIRECT) {
- if (skb_dst(skb2)->ops->redirect)
- skb_dst(skb2)->ops->redirect(skb_dst(skb2), skb2);
- }
+ if (rel_type == ICMP_REDIRECT)
+ skb_dst(skb2)->ops->redirect(skb_dst(skb2), skb2);
icmp_send(skb2, rel_type, rel_code, htonl(rel_info));