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

Commit a8b56389 authored by Eric Dumazet's avatar Eric Dumazet Committed by Patrick McHardy
Browse files

netfilter: br_netfilter: use skb_set_noref() 



Avoid dirtying bridge_parent_rtable refcount, using new dst noref
infrastructure.

Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 0da529a7

net/bridge/br_netfilter.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -244,8 +244,7 @@ static int br_nf_pre_routing_finish_ipv6(struct sk_buff *skb) 
		kfree_skb(skb);

		kfree_skb(skb);

		return 0;

		return 0;

	}

	}

	dst_hold(&rt->u.dst);

	skb_dst_set_noref(skb, &rt->u.dst);

	skb_dst_set(skb, &rt->u.dst);





	skb->dev = nf_bridge->physindev;

	skb->dev = nf_bridge->physindev;

	nf_bridge_update_protocol(skb);

	nf_bridge_update_protocol(skb);
@@ -396,8 +395,7 @@ static int br_nf_pre_routing_finish(struct sk_buff *skb) 
			kfree_skb(skb);

			kfree_skb(skb);

			return 0;

			return 0;

		}

		}

		dst_hold(&rt->u.dst);

		skb_dst_set_noref(skb, &rt->u.dst);

		skb_dst_set(skb, &rt->u.dst);

	}

	}





	skb->dev = nf_bridge->physindev;

	skb->dev = nf_bridge->physindev;