datapath: Remove NF_CT_NEW_REPLY

Upstream commit:
    commit bfa3f9d7f3b349acea8982d2248e33a0ed84c687
    Author: Jarno Rajahalme <jarno@ovn.org>
    Date:   Thu Mar 10 10:54:16 2016 -0800

    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: Jarno Rajahalme <jarno@ovn.org>
    Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
Acked-by: Jesse Gross <jesse@kernel.org>

diff --git a/datapath/conntrack.c b/datapath/conntrack.c
index 13cacf4..4b6fdae 100644 (file)
--- a/datapath/conntrack.c
+++ b/datapath/conntrack.c
@@ -81,7 +81,6 @@ static u8 ovs_ct_get_state(enum ip_conntrack_info ctinfo)
        switch (ctinfo) {
        case IP_CT_ESTABLISHED_REPLY:
        case IP_CT_RELATED_REPLY:
-       case IP_CT_NEW_REPLY:
                ct_state |= OVS_CS_F_REPLY_DIR;
                break;
        default:
@@ -98,7 +97,6 @@ static u8 ovs_ct_get_state(enum ip_conntrack_info ctinfo)
                ct_state |= OVS_CS_F_RELATED;
                break;
        case IP_CT_NEW:
-       case IP_CT_NEW_REPLY:
                ct_state |= OVS_CS_F_NEW;
                break;
        default: