aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-07-12 03:41:25 -0400
committerDavid S. Miller <davem@davemloft.net>2012-07-12 03:41:25 -0400
commit1ed5c48f231cd00eac0b3d2350ac61e3c825063e (patch)
treea2ddd1e4c432d7300396814320608ee946030fc1 /net/ipv6
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')
-rw-r--r--net/ipv6/ip6_tunnel.c6
-rw-r--r--net/ipv6/tcp_ipv6.c2
2 files changed, 3 insertions, 5 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index 0b5b60ec6f4a..61d106597296 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,
611 611
612 skb_dst(skb2)->ops->update_pmtu(skb_dst(skb2), rel_info); 612 skb_dst(skb2)->ops->update_pmtu(skb_dst(skb2), rel_info);
613 } 613 }
614 if (rel_type == ICMP_REDIRECT) { 614 if (rel_type == ICMP_REDIRECT)
615 if (skb_dst(skb2)->ops->redirect) 615 skb_dst(skb2)->ops->redirect(skb_dst(skb2), skb2);
616 skb_dst(skb2)->ops->redirect(skb_dst(skb2), skb2);
617 }
618 616
619 icmp_send(skb2, rel_type, rel_code, htonl(rel_info)); 617 icmp_send(skb2, rel_type, rel_code, htonl(rel_info));
620 618
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 7249e4bb9b8a..3071f377145c 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -366,7 +366,7 @@ static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
366 if (type == NDISC_REDIRECT) { 366 if (type == NDISC_REDIRECT) {
367 struct dst_entry *dst = __sk_dst_check(sk, np->dst_cookie); 367 struct dst_entry *dst = __sk_dst_check(sk, np->dst_cookie);
368 368
369 if (dst && dst->ops->redirect) 369 if (dst)
370 dst->ops->redirect(dst,skb); 370 dst->ops->redirect(dst,skb);
371 } 371 }
372 372