From patchwork Fri Oct 16 18:08:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Stringer X-Patchwork-Id: 531520 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 1D90C1402B7 for ; Sat, 17 Oct 2015 05:08:48 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932274AbbJPSIn (ORCPT ); Fri, 16 Oct 2015 14:08:43 -0400 Received: from mail-pa0-f42.google.com ([209.85.220.42]:35726 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752308AbbJPSIe (ORCPT ); Fri, 16 Oct 2015 14:08:34 -0400 Received: by padcn9 with SMTP id cn9so12035833pad.2 for ; Fri, 16 Oct 2015 11:08:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=PRWyxS3PeyVeopP7o+Sksl3G2cmS/R26MqNj5dmq3Ms=; b=eMWYZjqL4siRSQd+gS1559IajNpFAevE4snJMykU+fzGpHR9+1RVfd+OgNjQ9A7V4D BDmkQy23zgpT6wmeO2nNd6q/9JTZlOqwr1Be2nlWOZSfOfTmK0p3Tnqntv7VfjfhwCWm vR9HkGkb8h7bc/9d5AgvLAFgdcF3VlcZ0sUOFXRR4u7Zktz1VrnVYoR4ap40ccCI/7FQ 7iPZwVyeogligtaRQufh1KNgg6VtAK71nvtvTaISbh1EnB8HCwdOYKXo69fKgUEyj9X4 n/wv9ka0/40KZ8EXePnp0pCkrJ2j9DkTS6cKNVVEmCSgK99nj1Xtn31np/Dr2qu1Xj8r bvcA== X-Gm-Message-State: ALoCoQliZ98Uy7YBum/HaeiyK+1VazHUusz0AizQ7s3bscOeSOTNybCZA/uKpqCWABQrR2niJM1r X-Received: by 10.66.229.8 with SMTP id sm8mr17903188pac.135.1445018914114; Fri, 16 Oct 2015 11:08:34 -0700 (PDT) Received: from localhost.localdomain ([208.91.2.4]) by smtp.gmail.com with ESMTPSA id yh3sm22401640pbb.82.2015.10.16.11.08.33 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 16 Oct 2015 11:08:33 -0700 (PDT) From: Joe Stringer To: netdev@vger.kernel.org, pshelar@nicira.com Subject: [PATCHv2 net 2/3] openvswitch: Treat IP_CT_RELATED as new Date: Fri, 16 Oct 2015 11:08:20 -0700 Message-Id: <1445018901-18839-3-git-send-email-joestringer@nicira.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1445018901-18839-1-git-send-email-joestringer@nicira.com> References: <1445018901-18839-1-git-send-email-joestringer@nicira.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org New, related connections are marked as such as part of ovs_ct_lookup(), but they are not marked as "new" if the commit flag is used. Make this consistent by treating IP_CT_RELATED as new as well. Reported-by: Jarno Rajahalme Signed-off-by: Joe Stringer Acked-by: Pravin B Shelar --- v2: Acked. --- net/openvswitch/conntrack.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c index 80bf702715bb..480dbb9095b7 100644 --- a/net/openvswitch/conntrack.c +++ b/net/openvswitch/conntrack.c @@ -86,6 +86,8 @@ static u8 ovs_ct_get_state(enum ip_conntrack_info ctinfo) ct_state |= OVS_CS_F_ESTABLISHED; break; case IP_CT_RELATED: + ct_state |= OVS_CS_F_NEW; + /* Fall through */ case IP_CT_RELATED_REPLY: ct_state |= OVS_CS_F_RELATED; break;