xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions 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
Download Patch File Download Diff File Expand all files Collapse all files

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