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

Commit bce91f8a authored by Jarno Rajahalme's avatar Jarno Rajahalme Committed by David S. Miller
Browse files

openvswitch: Remove incorrect WARN_ONCE(). 



ovs_ct_find_existing() issues a warning if an existing conntrack entry
classified as IP_CT_NEW is found, with the premise that this should
not happen.  However, a newly confirmed, non-expected conntrack entry
remains IP_CT_NEW as long as no reply direction traffic is seen.  This
has resulted into somewhat confusing kernel log messages.  This patch
removes this check and warning.

Fixes: 289f2253 ("openvswitch: Find existing conntrack entry after upcall.")
Suggested-by: default avatarJoe Stringer <joe@ovn.org>
Signed-off-by: default avatarJarno Rajahalme <jarno@ovn.org>
Acked-by: default avatarJoe Stringer <joe@ovn.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bf0f500b

net/openvswitch/conntrack.c

+1 −7
Original line number Diff line number Diff line
@@ -433,7 +433,6 @@ ovs_ct_find_existing(struct net *net, const struct nf_conntrack_zone *zone, 
	struct nf_conntrack_l4proto *l4proto;

	struct nf_conntrack_tuple tuple;

	struct nf_conntrack_tuple_hash *h;

	enum ip_conntrack_info ctinfo;

	struct nf_conn *ct;

	unsigned int dataoff;

	u8 protonum;
@@ -458,13 +457,8 @@ ovs_ct_find_existing(struct net *net, const struct nf_conntrack_zone *zone, 


	ct = nf_ct_tuplehash_to_ctrack(h);



	ctinfo = ovs_ct_get_info(h);

	if (ctinfo == IP_CT_NEW) {

		/* This should not happen. */

		WARN_ONCE(1, "ovs_ct_find_existing: new packet for %p\n", ct);

	}

	skb->nfct = &ct->ct_general;

	skb->nfctinfo = ctinfo;

	skb->nfctinfo = ovs_ct_get_info(h);

	return ct;

}