diff options
| author | David S. Miller <davem@davemloft.net> | 2012-07-12 00:41:25 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-12 00:41:25 -0700 |
| commit | 1ed5c48f231cd00eac0b3d2350ac61e3c825063e (patch) | |
| tree | a2ddd1e4c432d7300396814320608ee946030fc1 /net/ipv6 | |
| parent | b587ee3ba21f58b7770a132e6bca5c6658ac5095 (diff) | |
| download | linux-1ed5c48f231cd00eac0b3d2350ac61e3c825063e.tar.gz linux-1ed5c48f231cd00eac0b3d2350ac61e3c825063e.tar.xz | |
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.c | 6 | ||||
| -rw-r--r-- | net/ipv6/tcp_ipv6.c | 2 |
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, 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)); 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, if (type == NDISC_REDIRECT) { struct dst_entry *dst = __sk_dst_check(sk, np->dst_cookie); - if (dst && dst->ops->redirect) + if (dst) dst->ops->redirect(dst,skb); } |