Message ID | 5adc940d86aa78621478c8b98aed9354268daa2c.1670518439.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=n0Ya8Rcq; 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 4NSgKW34qdz23yq for <incoming@patchwork.ozlabs.org>; Fri, 9 Dec 2022 03:56:31 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 0B82A6118C; Thu, 8 Dec 2022 16:56:29 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 0B82A6118C 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=n0Ya8Rcq 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 DoF6KBXrI7Et; Thu, 8 Dec 2022 16:56:28 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp3.osuosl.org (Postfix) with ESMTPS id B6BD461179; Thu, 8 Dec 2022 16:56:26 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org B6BD461179 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 32E52C0082; Thu, 8 Dec 2022 16:56:26 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id B44ADC002D for <dev@openvswitch.org>; Thu, 8 Dec 2022 16:56:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 81D6941999 for <dev@openvswitch.org>; Thu, 8 Dec 2022 16:56:22 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 81D6941999 Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=n0Ya8Rcq X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id l1wV1emgtycf for <dev@openvswitch.org>; Thu, 8 Dec 2022 16:56:21 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 4859B4198B Received: from mail-qt1-x82b.google.com (mail-qt1-x82b.google.com [IPv6:2607:f8b0:4864:20::82b]) by smtp4.osuosl.org (Postfix) with ESMTPS id 4859B4198B for <dev@openvswitch.org>; Thu, 8 Dec 2022 16:56:21 +0000 (UTC) Received: by mail-qt1-x82b.google.com with SMTP id cg5so1492417qtb.12 for <dev@openvswitch.org>; Thu, 08 Dec 2022 08:56:21 -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=BCSUkUl3qtx2Ug0vdO9kQ6Q3WtijYxxWczDbAdumJqo=; b=n0Ya8RcqfMU7o7wPi2E0YHiWclCqbgsYfeOHu85asflLhnFtnwewxrU7Gow+oIR12Q tnJFcnXG572kZlLwRVQHdIncSblkcaGIQxbG9KWWZf7U2bDRlSZJQd08KEb1FjmEi+HL 8cSMJRhsbIFfsQIPbVqHqWGvVGhuKn27JbEEwVy9c7vSNPZPu0J4es2Hgt+zUPhijHwW EufXlDQrsujREDgvmBZlAIfUATOPNpmy/ZmTUemV8Qeew3PbqJMrI8xV+JQBF9G8lPoh t6HlfOV3Fmxf+MrXx+0ZoyOVZuSKOrmHtkE2ZFhRMiKAfWwINe0UZvp6aEknnc3f3wz8 NcJQ== 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=BCSUkUl3qtx2Ug0vdO9kQ6Q3WtijYxxWczDbAdumJqo=; b=5yxvbwSwl2FH2d+ZZ+fUlwKWzPWIbkIWzqDGeA9jhMn0Sm8bHZUSX+LoEJubjgHSb5 OArzXvYzqdpl9NoNiPuC8cdYlxenCF+UCcvfk80xeh1sIziZ/42KBcap2ffq7eMYZAol FtHShFx7IAXkH+kGydvGzd6bb0qRPR+BxHEI95IyrLjG3C3N7bIzoZv3EcPwBF9B2iDA PSt1X0IiNKiwZiSXbjELL6g7bp8fomXep8TLshdNI5dAFyibrTmyeR0HvHdg4Ui3RvcG 3t92GcwoQc738wQ0DNaU2X/xPDL9aT0DUX2p7bRrIvQDTbi8h7fCw8sVEXUSOmjx7ih7 IOgw== X-Gm-Message-State: ANoB5pkGy28Rjotu9mLubsq5R1IUCREFxlsYo1pKkmobLndFRbigMZTD XmNFm4MiO9SN124fMc5yebA= X-Google-Smtp-Source: AA0mqf6z2jj3y/xOeUoNc37r3HQ23Pl21S5IvuAVg3KBxqu9HqgHHS4jNkznuEvEWe3gbESHVqQNQQ== X-Received: by 2002:ac8:7598:0:b0:3a6:89b2:c69a with SMTP id s24-20020ac87598000000b003a689b2c69amr3869966qtq.0.1670518580854; Thu, 08 Dec 2022 08:56:20 -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 j13-20020a05620a288d00b006fbbdc6c68fsm20091298qkp.68.2022.12.08.08.56.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Dec 2022 08:56:20 -0800 (PST) From: Xin Long <lucien.xin@gmail.com> To: network dev <netdev@vger.kernel.org>, dev@openvswitch.org Date: Thu, 8 Dec 2022 11:56:11 -0500 Message-Id: <5adc940d86aa78621478c8b98aed9354268daa2c.1670518439.git.lucien.xin@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <cover.1670518439.git.lucien.xin@gmail.com> References: <cover.1670518439.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>, Saeed Mahameed <saeed@kernel.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] [PATCHv4 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 dd5ae7551956..bb87d1e910ea 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 */