Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ed5c48f authored by David S. Miller's avatar David S. Miller
Browse files

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



No longer necessary.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b587ee3b

net/dccp/ipv4.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}

net/dccp/ipv6.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

	}

net/ipv4/tcp_ipv4.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}

net/ipv4/xfrm4_policy.c

+1 −2
Original line number Diff line number Diff line
@@ -207,7 +207,6 @@ 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);

}

net/ipv6/ip6_tunnel.c

+2 −4
Original line number Diff line number Diff line
@@ -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)

	if (rel_type == ICMP_REDIRECT)

		skb_dst(skb2)->ops->redirect(skb_dst(skb2), skb2);

	}



	icmp_send(skb2, rel_type, rel_code, htonl(rel_info));