leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
No longer necessary.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2012-07-12 00:41:25 -07:00
parent b587ee3ba2
commit 1ed5c48f23
7 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/dccp/ipv4.c
View File

@ -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);
}

2
net/dccp/ipv6.c
View File

@ -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);
}

2
net/ipv4/tcp_ipv4.c
View File

@ -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);
}

3
net/ipv4/xfrm4_policy.c
View File

@ -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)

6
net/ipv6/ip6_tunnel.c
View File

@ -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));

2
net/ipv6/tcp_ipv6.c
View File

@ -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);
}

2
net/sctp/input.c
View File

@ -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);
}