Commit ab8bc7ed authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: remove nf_ct_is_untracked 



This function is now obsolete and always returns false.
This change has no effect on generated code.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent cc41c84b

include/net/ip_vs.h

+2 −2
Original line number Diff line number Diff line
@@ -1555,7 +1555,7 @@ static inline void ip_vs_notrack(struct sk_buff *skb) 
	enum ip_conntrack_info ctinfo;

	struct nf_conn *ct = nf_ct_get(skb, &ctinfo);



	if (!ct || !nf_ct_is_untracked(ct)) {

	if (ct) {

		nf_conntrack_put(&ct->ct_general);

		nf_ct_set(skb, NULL, IP_CT_UNTRACKED);

	}
@@ -1616,7 +1616,7 @@ static inline bool ip_vs_conn_uses_conntrack(struct ip_vs_conn *cp, 
	if (!(cp->flags & IP_VS_CONN_F_NFCT))

		return false;

	ct = nf_ct_get(skb, &ctinfo);

	if (ct && !nf_ct_is_untracked(ct))

	if (ct)

		return true;

#endif

	return false;

include/net/netfilter/nf_conntrack.h

+0 −5
Original line number Diff line number Diff line
@@ -273,11 +273,6 @@ static inline int nf_ct_is_dying(const struct nf_conn *ct) 
	return test_bit(IPS_DYING_BIT, &ct->status);

}



static inline int nf_ct_is_untracked(const struct nf_conn *ct)

{

	return false;

}



/* Packet is received from loopback */

static inline bool nf_is_loopback_packet(const struct sk_buff *skb)

{

include/net/netfilter/nf_conntrack_core.h

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static inline int nf_conntrack_confirm(struct sk_buff *skb) 
	struct nf_conn *ct = (struct nf_conn *)skb_nfct(skb);

	int ret = NF_ACCEPT;



	if (ct && !nf_ct_is_untracked(ct)) {

	if (ct) {

		if (!nf_ct_is_confirmed(ct))

			ret = __nf_conntrack_confirm(skb);

		if (likely(ret == NF_ACCEPT))

net/ipv4/netfilter/nf_nat_l3proto_ipv4.c

+0 −4
Original line number Diff line number Diff line
@@ -264,10 +264,6 @@ nf_nat_ipv4_fn(void *priv, struct sk_buff *skb, 
	if (!ct)

		return NF_ACCEPT;



	/* Don't try to NAT if this packet is not conntracked */

	if (nf_ct_is_untracked(ct))

		return NF_ACCEPT;



	nat = nf_ct_nat_ext_add(ct);

	if (nat == NULL)

		return NF_ACCEPT;

net/ipv4/netfilter/nf_socket_ipv4.c

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ struct sock *nf_sk_lookup_slow_v4(struct net *net, const struct sk_buff *skb, 
	 * SNAT-ted connection.

	 */

	ct = nf_ct_get(skb, &ctinfo);

	if (ct && !nf_ct_is_untracked(ct) &&

	if (ct &&

	    ((iph->protocol != IPPROTO_ICMP &&

	      ctinfo == IP_CT_ESTABLISHED_REPLY) ||

	     (iph->protocol == IPPROTO_ICMP &&