net: Remove checks for dst_ops->redirect being NULL.

No longer necessary.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index 8f41a31..129ed8f 100644 (file)
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -199,7 +199,7 @@ static void dccp_do_redirect(struct sk_buff *skb, struct sock *sk)
 {
        struct dst_entry *dst = __sk_dst_check(sk, 0);
 
-       if (dst && dst->ops->redirect)
+       if (dst)
                dst->ops->redirect(dst, skb);
 }
 

diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
index b4d7d28..090c080 100644 (file)
--- a/net/dccp/ipv6.c
+++ b/net/dccp/ipv6.c
@@ -133,7 +133,7 @@ static void dccp_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);
        }
 

diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 087a848..7a0062c 100644 (file)
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -325,7 +325,7 @@ static void do_redirect(struct sk_buff *skb, struct sock *sk)
 {
        struct dst_entry *dst = __sk_dst_check(sk, 0);
 
-       if (dst && dst->ops->redirect)
+       if (dst)
                dst->ops->redirect(dst, skb);
 }
 

diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
index 258ebd7..737131c 100644 (file)
--- a/net/ipv4/xfrm4_policy.c
+++ b/net/ipv4/xfrm4_policy.c
@@ -207,8 +207,7 @@ static void xfrm4_redirect(struct dst_entry *dst, struct sk_buff *skb)
        struct xfrm_dst *xdst = (struct xfrm_dst *)dst;
        struct dst_entry *path = xdst->route;
 
-       if (path->ops->redirect)
-               path->ops->redirect(path, skb);
+       path->ops->redirect(path, skb);
 }
 
 static void xfrm4_dst_destroy(struct dst_entry *dst)

diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index 0b5b60e..61d1065 100644 (file)
--- 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 7249e4b..3071f37 100644 (file)
--- 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);
        }
 

diff --git a/net/sctp/input.c b/net/sctp/input.c
index 5943b7d..f050d45 100644 (file)
--- a/net/sctp/input.c
+++ b/net/sctp/input.c
@@ -431,7 +431,7 @@ void sctp_icmp_redirect(struct sock *sk, struct sctp_transport *t,
        if (!t)
                return;
        dst = sctp_transport_dst_check(t);
-       if (dst && dst->ops->redirect)
+       if (dst)
                dst->ops->redirect(dst, skb);
 }