Message ID | dc9fc5ba4cb9036e52005b207c75cd56755db49d.1669138256.git.lucien.xin@gmail.com |
---|---|
State | Handled Elsewhere |
Headers | show
Return-Path: <ovs-dev-bounces@openvswitch.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=<UNKNOWN>) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=Wxw0POML; dkim-atps=neutral Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NGrts10NMz23nq for <incoming@patchwork.ozlabs.org>; Wed, 23 Nov 2022 04:32:53 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 182B761161; Tue, 22 Nov 2022 17:32:51 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 182B761161 Authentication-Results: smtp3.osuosl.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=Wxw0POML X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id skRPKXDJJJXW; Tue, 22 Nov 2022 17:32:49 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp3.osuosl.org (Postfix) with ESMTPS id B1D1E6F973; Tue, 22 Nov 2022 17:32:43 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org B1D1E6F973 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 6E606C0085; Tue, 22 Nov 2022 17:32:39 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 299A4C0083; Tue, 22 Nov 2022 17:32:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 928F781EBA; Tue, 22 Nov 2022 17:32:32 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 928F781EBA Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=Wxw0POML X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DnHLA0YEOtda; Tue, 22 Nov 2022 17:32:31 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 06C5381FE5 X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-qv1-xf2c.google.com (mail-qv1-xf2c.google.com [IPv6:2607:f8b0:4864:20::f2c]) by smtp1.osuosl.org (Postfix) with ESMTPS id 06C5381FE5; Tue, 22 Nov 2022 17:32:30 +0000 (UTC) Received: by mail-qv1-xf2c.google.com with SMTP id p8so9895144qvn.5; Tue, 22 Nov 2022 09:32:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ehYMZLUvktYqzKA34sv7SuHaatYQ6MJnVzzXpFPOn90=; b=Wxw0POML48rxxCfZhsB12TWOdfQVZsErlNcHgFS0s7/Gvw46wg5SWeBluWWCovvF2/ X++fI5mIdwmXQFopsUcpg0SvQ3VxT54FELCHcD8mlQ7zAGAE0wBGXDfi2wcNdqcvraB4 3OgbxSBo01mnjrD/WNh2iLUkjI7zDhJ2VszPhfPs3Xe9P2HtUmkexEmilFuKZDsXVJAV LKpIb3QNihdv/bfuuFD7szLKXEpFKH+nQLtja07rf9mNWx+EAEPkO6GU7FRyKNE5MeZH P0qNpetehD9fLP9KNo3tyw3w0Du9UCWZTiWuvgA233V+FYOwTxxNVMM+YqZAUZNZxTfm DbqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ehYMZLUvktYqzKA34sv7SuHaatYQ6MJnVzzXpFPOn90=; b=V5ahd+lzi33oX7qF5JHWLAebHgVd5Xue1jYGPvb2X/x5g0JrFLi1aOFEx6kPpxc82o 0TscReoC66dLV8Dnn7xdT7/vGLW9ZpbuEqs7vgUSCDLsnjTz8G34PIYJMklJIq5cyvY/ aJivYMKfAtt/sti4uAZO8Z1hEW1aDU3H9157uQoypBxiX6LBEOyEbvAPgvo0Jk9i+11J oj2LFZ25xex4HTlcfyMaIoTQybTc77eBV7xVxru/cfzCgCsAYl1EzhZ7/uUxqxyOj1Sc c80mRLtNtRlBO4G++qQjYg9oh8r61sHkEEF2UXyLxYGaw1Ac8N8V9QLT0gHpkSOb23dw D6oQ== X-Gm-Message-State: ANoB5pnVoB4P2m6O4eKJncRhEnczZfk3vmxdh3vhQ/PuVHlHVc/YKoCw y5o/ugUQgLJxpQnUvhhF5VA= X-Google-Smtp-Source: AA0mqf4K1BREno2zDFwDVF/74PCDBPw4jYxVFBZ2PHInrluIy3/nzY+7WtVxM6/yEy+6sjwaJVsBHw== X-Received: by 2002:a0c:fa01:0:b0:4b4:6402:bc03 with SMTP id q1-20020a0cfa01000000b004b46402bc03mr4450970qvn.81.1669138349779; Tue, 22 Nov 2022 09:32:29 -0800 (PST) Received: from wsfd-netdev15.ntdv.lab.eng.bos.redhat.com (nat-pool-bos-t.redhat.com. [66.187.233.206]) by smtp.gmail.com with ESMTPSA id j12-20020a05620a410c00b006eef13ef4c8sm10865040qko.94.2022.11.22.09.32.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 09:32:29 -0800 (PST) From: Xin Long <lucien.xin@gmail.com> To: network dev <netdev@vger.kernel.org>, dev@openvswitch.org, ovs-dev@openvswitch.org Date: Tue, 22 Nov 2022 12:32:20 -0500 Message-Id: <dc9fc5ba4cb9036e52005b207c75cd56755db49d.1669138256.git.lucien.xin@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <cover.1669138256.git.lucien.xin@gmail.com> References: <cover.1669138256.git.lucien.xin@gmail.com> MIME-Version: 1.0 Cc: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>, Jiri Pirko <jiri@resnulli.us>, Paul Blakey <paulb@nvidia.com>, Davide Caratti <dcaratti@redhat.com>, Florian Westphal <fw@strlen.de>, Jamal Hadi Salim <jhs@mojatatu.com>, Ilya Maximets <i.maximets@ovn.org>, Eric Dumazet <edumazet@google.com>, Cong Wang <xiyou.wangcong@gmail.com>, kuba@kernel.org, Paolo Abeni <pabeni@redhat.com>, davem@davemloft.net, Pablo Neira Ayuso <pablo@netfilter.org> Subject: [ovs-dev] [PATCHv2 net-next 4/5] net: sched: update the nat flag for icmp error packets in ct_nat_execute X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: <ovs-dev.openvswitch.org> List-Unsubscribe: <https://mail.openvswitch.org/mailman/options/ovs-dev>, <mailto:ovs-dev-request@openvswitch.org?subject=unsubscribe> List-Archive: <http://mail.openvswitch.org/pipermail/ovs-dev/> List-Post: <mailto:ovs-dev@openvswitch.org> List-Help: <mailto:ovs-dev-request@openvswitch.org?subject=help> List-Subscribe: <https://mail.openvswitch.org/mailman/listinfo/ovs-dev>, <mailto:ovs-dev-request@openvswitch.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" <ovs-dev-bounces@openvswitch.org> |
Series |
net: eliminate the duplicate code in the ct nat functions of ovs and tc
|
expand
|
diff --git a/net/sched/act_ct.c b/net/sched/act_ct.c index 8869b3ef6642..c7782c9a6ab6 100644 --- a/net/sched/act_ct.c +++ b/net/sched/act_ct.c @@ -936,13 +936,13 @@ static int ct_nat_execute(struct sk_buff *skb, struct nf_conn *ct, } err = nf_nat_packet(ct, ctinfo, hooknum, skb); +out: if (err == NF_ACCEPT) { if (maniptype == NF_NAT_MANIP_SRC) tc_skb_cb(skb)->post_ct_snat = 1; if (maniptype == NF_NAT_MANIP_DST) tc_skb_cb(skb)->post_ct_dnat = 1; } -out: return err; } #endif /* CONFIG_NF_NAT */