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

Commit 1758fd46 authored by Wei Wang's avatar Wei Wang Committed by David S. Miller
Browse files

ipv6: remove unnecessary dst_hold() in ip6_fragment() 



In ipv6 tx path, rcu_read_lock() is taken so that dst won't get freed
during the execution of ip6_fragment(). Hence, no need to hold dst in
it.

Signed-off-by: default avatarWei Wang <weiwan@google.com>
Acked-by: default avatarMartin KaFai Lau <kafai@fb.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 273889e3

net/ipv6/ip6_output.c

+0 −4
Original line number Diff line number Diff line
@@ -698,8 +698,6 @@ int ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb, 
		ipv6_hdr(skb)->payload_len = htons(first_len -

						   sizeof(struct ipv6hdr));



		dst_hold(&rt->dst);



		for (;;) {

			/* Prepare header of the next frame,

			 * before previous one went down. */
@@ -742,7 +740,6 @@ int ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb, 
		if (err == 0) {

			IP6_INC_STATS(net, ip6_dst_idev(&rt->dst),

				      IPSTATS_MIB_FRAGOKS);

			ip6_rt_put(rt);

			return 0;

		}
@@ -750,7 +747,6 @@ int ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb, 


		IP6_INC_STATS(net, ip6_dst_idev(&rt->dst),

			      IPSTATS_MIB_FRAGFAILS);

		ip6_rt_put(rt);

		return err;



slow_path_clean: