From patchwork Fri May 10 19:30:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yifeng Sun X-Patchwork-Id: 1098308 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="O+dZcW1t"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4510kS5yZ3z9s7h for ; Sat, 11 May 2019 05:33:36 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id B1A2EEC6; Fri, 10 May 2019 19:30:28 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 47600EA6 for ; Fri, 10 May 2019 19:30:27 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id E77FC1FB for ; Fri, 10 May 2019 19:30:26 +0000 (UTC) Received: by mail-pl1-f193.google.com with SMTP id g9so3280039plm.6 for ; Fri, 10 May 2019 12:30:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jBkqbD/W8Y3fTLv4w8xkMae32s6BEwFHclTkhRkhBHs=; b=O+dZcW1tmbrHP+n//40rDgMsur/Gkd9XPJeEH4WbV/l7zJKwz1YgQmUbGu/28P+dUn iQsoLtrGf5DLwOJn/oP3Qf8xWFz0T/IsLBRblowS+zMIi3vgYa9XY0ccUOME5kxPpQCv Xf4Y752pr0WtaobtsGT4hhovwb20VX1RS3Xgaml9WHRmEC7pKbBoicdtnjZ4oUB+v9GK GG/DSXBp/9b3jNNlaHwQgWXRuygXcMxkr0KfgM9LXWJudwU1xUlQUpfmWk0RtMumdLIH DLFDgrilYMPrnjEwVTE94PbfNzmU491Ry8JwapicOrvfb1wRk2PScmfTQmpf9vUnaiAU +yZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jBkqbD/W8Y3fTLv4w8xkMae32s6BEwFHclTkhRkhBHs=; b=trcwn/GG1X8BKtbUD1TD+MF9H+FgrTWSihAmXUVQ7qVWrTY9cAJOOEUWRmJ9Eci53z /opL5xRtIMz0JpcdAKrw1i40+qFSyCvjyGdgatHIMACEFFoIAL3rj+3RF3QyT/NSXhbU YN6YgySP+hMmEIHFDuEnwo5hurjA55fU7kEcwkCGZT8CoQjr0nrkYGQfGcbV8RshrvrQ zFZAa/svfgQKjZdH0Gia7G6xMyC6XugtkMFgnYIlsYww3nCkLX4UBx5bUhUAeDq7sRbT QPk09LMjqgFODSYboHErjM6lxkgaQHmzpmnRFM59z3HHh5jG9y8Lnq8VwIB1ul5qJGTZ 5tLw== X-Gm-Message-State: APjAAAUyP3O1vEhTxJTruh2JQqn+JCW14F33vGOBi/nseLX7IDuzO7JH JUI1f0G8c5ErwhOJildVpo465PyD X-Google-Smtp-Source: APXvYqzMWWOx0HnIQdb5GkVSrjd0DONIwRBWR2YuiVoZCbyarYJiXS1AekWWh2rnrSD23BITumDVwg== X-Received: by 2002:a17:902:3064:: with SMTP id u91mr15473264plb.181.1557516626236; Fri, 10 May 2019 12:30:26 -0700 (PDT) Received: from kern417.eng.vmware.com ([66.170.99.2]) by smtp.gmail.com with ESMTPSA id h13sm6423301pgk.55.2019.05.10.12.30.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 10 May 2019 12:30:25 -0700 (PDT) From: Yifeng Sun To: dev@openvswitch.org Date: Fri, 10 May 2019 12:30:13 -0700 Message-Id: <1557516614-12563-7-git-send-email-pkusunyifeng@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1557516614-12563-1-git-send-email-pkusunyifeng@gmail.com> References: <1557516614-12563-1-git-send-email-pkusunyifeng@gmail.com> X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Gao Feng Subject: [ovs-dev] [PATCH 6/7 v3] netfilter: Remove useless param helper of nf_ct_helper_ext_add X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org From: Gao Feng Upstream commit: commit 440534d3c56be04abfb26850ee882d19d223557a Author: Gao Feng Date: Mon Jul 9 18:06:33 2018 +0800 netfilter: Remove useless param helper of nf_ct_helper_ext_add The param helper of nf_ct_helper_ext_add is useless now, then remove it now. Signed-off-by: Gao Feng Signed-off-by: Pablo Neira Ayuso This patch backports the above upstream patch to OVS. Cc: Gao Feng Signed-off-by: Yifeng Sun Acked-by: Yi-Hung Wei --- v1->v2: Rebase previous patch's changes. acinclude.m4 | 3 +++ .../linux/compat/include/net/netfilter/nf_conntrack_helper.h | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/acinclude.m4 b/acinclude.m4 index 4f9aebc325ba..878c2f6d40f2 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -936,6 +936,9 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ [OVS_DEFINE([HAVE_NF_CONNTRACK_IN_TAKES_NF_HOOK_STATE])]) OVS_GREP_IFELSE([$KSRC/include/net/ipv6_frag.h], [IP6_DEFRAG_CONNTRACK_IN], [OVS_DEFINE([HAVE_IPV6_FRAG_H])]) + OVS_FIND_PARAM_IFELSE([$KSRC/include/net/netfilter/nf_conntrack_helper.h], + [nf_ct_helper_ext_add], [nf_conntrack_helper], + [OVS_DEFINE([HAVE_NF_CT_HELPER_EXT_ADD_TAKES_HELPER])]) if cmp -s datapath/linux/kcompat.h.new \ datapath/linux/kcompat.h >/dev/null 2>&1; then diff --git a/datapath/linux/compat/include/net/netfilter/nf_conntrack_helper.h b/datapath/linux/compat/include/net/netfilter/nf_conntrack_helper.h index 19c35cd95f6f..b6a3d0bf75b3 100644 --- a/datapath/linux/compat/include/net/netfilter/nf_conntrack_helper.h +++ b/datapath/linux/compat/include/net/netfilter/nf_conntrack_helper.h @@ -9,4 +9,14 @@ static inline void nf_conntrack_helper_put(struct nf_conntrack_helper *helper) { } #endif +#ifndef HAVE_NF_CT_HELPER_EXT_ADD_TAKES_HELPER +static inline struct nf_conn_help * +rpl_nf_ct_helper_ext_add(struct nf_conn *ct, + struct nf_conntrack_helper *helper, gfp_t gfp) +{ + return nf_ct_helper_ext_add(ct, gfp); +} +#define nf_ct_helper_ext_add rpl_nf_ct_helper_ext_add +#endif /* HAVE_NF_CT_HELPER_EXT_ADD_TAKES_HELPER */ + #endif /* _NF_CONNTRACK_HELPER_WRAPPER_H */