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

Commit bfa3f9d7 authored by Jarno Rajahalme's avatar Jarno Rajahalme Committed by Pablo Neira Ayuso
Browse files

netfilter: Remove IP_CT_NEW_REPLY definition. 



Remove the definition of IP_CT_NEW_REPLY from the kernel as it does
not make sense.  This allows the definition of IP_CT_NUMBER to be
simplified as well.

Signed-off-by: default avatarJarno Rajahalme <jarno@ovn.org>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent d157bd76

include/uapi/linux/netfilter/nf_conntrack_common.h

+9 −3
Original line number Original line Diff line number Diff line
@@ -20,9 +20,15 @@ enum ip_conntrack_info { 




	IP_CT_ESTABLISHED_REPLY = IP_CT_ESTABLISHED + IP_CT_IS_REPLY,

	IP_CT_ESTABLISHED_REPLY = IP_CT_ESTABLISHED + IP_CT_IS_REPLY,

	IP_CT_RELATED_REPLY = IP_CT_RELATED + IP_CT_IS_REPLY,

	IP_CT_RELATED_REPLY = IP_CT_RELATED + IP_CT_IS_REPLY,

	IP_CT_NEW_REPLY = IP_CT_NEW + IP_CT_IS_REPLY,	

	/* No NEW in reply direction. */

	/* Number of distinct IP_CT types (no NEW in reply dirn). */



	IP_CT_NUMBER = IP_CT_IS_REPLY * 2 - 1

	/* Number of distinct IP_CT types. */

	IP_CT_NUMBER,



	/* only for userspace compatibility */

#ifndef __KERNEL__

	IP_CT_NEW_REPLY = IP_CT_NUMBER,

#endif

};

};





#define NF_CT_STATE_INVALID_BIT			(1 << 0)

#define NF_CT_STATE_INVALID_BIT			(1 << 0)

net/openvswitch/conntrack.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -75,7 +75,6 @@ static u8 ovs_ct_get_state(enum ip_conntrack_info ctinfo) 
	switch (ctinfo) {

	switch (ctinfo) {

	case IP_CT_ESTABLISHED_REPLY:

	case IP_CT_ESTABLISHED_REPLY:

	case IP_CT_RELATED_REPLY:

	case IP_CT_RELATED_REPLY:

	case IP_CT_NEW_REPLY:

		ct_state |= OVS_CS_F_REPLY_DIR;

		ct_state |= OVS_CS_F_REPLY_DIR;

		break;

		break;

	default:

	default:
@@ -92,7 +91,6 @@ static u8 ovs_ct_get_state(enum ip_conntrack_info ctinfo) 
		ct_state |= OVS_CS_F_RELATED;

		ct_state |= OVS_CS_F_RELATED;

		break;

		break;

	case IP_CT_NEW:

	case IP_CT_NEW:

	case IP_CT_NEW_REPLY:

		ct_state |= OVS_CS_F_NEW;

		ct_state |= OVS_CS_F_NEW;

		break;

		break;

	default:

	default: