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

Commit 209675bd authored Jul 24, 2017 by Amit Pundir

ANDROID: netfilter: nf_socket: Use refcount_inc() instead of atomic_inc()

Since upstream commit 41c6d650 ("net: convert sock.sk_refcnt from
atomic_t to refcount_t") changed sk_refcnt to refcount_t from atomic_t.

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>

parent ae336b3a

net/ipv4/netfilter/nf_socket_ipv4.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -155,7 +155,7 @@ struct sock nf_sk_lookup_slow_v4(struct net net, const struct sk_buff *skb,
	#endif		#endif

	if (sk)		if (sk)
	atomic_inc(&sk->sk_refcnt);		refcount_inc(&sk->sk_refcnt);
	else		else
	sk = nf_socket_get_sock_v4(dev_net(skb->dev), data_skb, doff,		sk = nf_socket_get_sock_v4(dev_net(skb->dev), data_skb, doff,
	protocol, saddr, daddr, sport,		protocol, saddr, daddr, sport,

net/ipv6/netfilter/nf_socket_ipv6.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -143,7 +143,7 @@ struct sock nf_sk_lookup_slow_v6(struct net net, const struct sk_buff *skb,
	}		}

	if (sk)		if (sk)
	atomic_inc(&sk->sk_refcnt);		refcount_inc(&sk->sk_refcnt);
	else		else
	sk = nf_socket_get_sock_v6(dev_net(skb->dev), data_skb, doff,		sk = nf_socket_get_sock_v6(dev_net(skb->dev), data_skb, doff,
	tproto, saddr, daddr, sport, dport,		tproto, saddr, daddr, sport, dport,