From patchwork Fri Oct 25 10:13:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 1183977 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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=none (p=none dis=none) header.from=netronome.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="Zhenbr5o"; 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 4700Mb2xbCz9s7T for ; Fri, 25 Oct 2019 21:14:18 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id DE77113CE; Fri, 25 Oct 2019 10:14:14 +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 3A156BDC for ; Fri, 25 Oct 2019 10:14:13 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 71D5987B for ; Fri, 25 Oct 2019 10:14:12 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id r1so1635254wrs.9 for ; Fri, 25 Oct 2019 03:14:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=3Z95lgPYRuCrHw15Q7ueTPuFLttf6t/sx6Xp+ZE+8Gw=; b=Zhenbr5ocAjJmPsMoLoePEzX+7ekRWkBotbUlgdwJrctd3YcNvC+KCdoxUNnAtD9Cn LJVpwQzFUyFd1J6SymtFIGD6DLwpTVHLp/6paAzrYM4QLxLVdrfziRpLnyNQ4cXX4laI WvPx5pGdyadE0EP405NcekQnqbxrClVc9jpHiP5cmet7TDvOCbbtNmqIycZcM6w2LkJp CLvoeYOQoXAcqZqZLjiEuG5dzKnuJ5FHLPSs3Ab5/Jqo+DrhkmZTMa/OAtWqZ9ZLUYrd HVhFluKwI9ms2gLB7pUYjAfuV6cvfTsJwOjoK1YMtf4Lmks/t5rTR+2myhwcy4InV9zZ eSEg== 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:mime-version :content-transfer-encoding; bh=3Z95lgPYRuCrHw15Q7ueTPuFLttf6t/sx6Xp+ZE+8Gw=; b=MkEGXiybZ7+GwEbXiKAvhElWT+Eq/0aR2fQHis+ryJCgjOfKYwO+c999a+JAViPKk4 /BjVDUfVKDBSSF5aeCL23/v58eCBwHzHwZiBAyOFNJ6FtaSnQBMrn2puzfZvP0KRPu9g Y0MejnDyeVuJoaioqOMSAqOT1b5yirCGgQaWQr1nUcEP2mxhKKI1f0IBcN+g4+fCzG0o BAo11ZcARRhy+Q6qtLk1fTJ1Zhkd3+lwWvRpCroVUn3UMwaolvJBZQilG0XldwVK5RUc 7otEMp9BV8F7jrS4gs596IfZJ1NS33syAbqFgAWmtWwrRd0fDdqpTANgEQk7M23LBG6E yoPA== X-Gm-Message-State: APjAAAWvqdrj2P7gbDiaGxLV1GGy3UEWt90p/024+mC7hMXvve5VRRJ3 SbkLlatDQ2PIMsReuPa7Yt7yiwDrS+g= X-Google-Smtp-Source: APXvYqwtap81CHCT34/wG1sPCpdmM1XH/XMBgWflDnSPJPdxK70UZsNIoXEwEQ71OiO1fX2RWIEofg== X-Received: by 2002:a5d:544d:: with SMTP id w13mr2273719wrv.19.1571998450619; Fri, 25 Oct 2019 03:14:10 -0700 (PDT) Received: from fred.horms.nl (fred-musen.rivierenbuurt.horms.nl. [2001:470:7eb3:404:a2a4:c5ff:fe4c:9ce9]) by smtp.gmail.com with ESMTPSA id b186sm1410645wmb.21.2019.10.25.03.14.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Oct 2019 03:14:09 -0700 (PDT) From: Simon Horman To: dev@openvswitch.org Date: Fri, 25 Oct 2019 12:13:36 +0200 Message-Id: <20191025101336.28217-1-simon.horman@netronome.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,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: oss-drivers@netronome.com, Simon Horman Subject: [ovs-dev] [PATCH branch-2.10] compat: Remove unused function 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: , Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org From: Greg Rose The compat function rpl_nf_conntrack_in() does not appear to be used anywhere and emits warnings as such during builds < 4.10. The patch passes Travis: https://travis-ci.org/gvrose8192/ovs-experimental/builds/423097292 Remove it. A backport of this patch to branch-2.10 seems to be required to fix build errors when compiling against v3.16.54 before: https://travis-ci.org/openvswitch/ovs/builds/602518689 after: https://travis-ci.org/horms2/ovs/builds/602665800 Signed-off-by: Greg Rose Signed-off-by: Ben Pfaff Signed-off-by: Simon Horman Reviewed-by: John Hurley --- .../include/net/netfilter/nf_conntrack_core.h | 21 ------------------- 1 file changed, 21 deletions(-) diff --git a/datapath/linux/compat/include/net/netfilter/nf_conntrack_core.h b/datapath/linux/compat/include/net/netfilter/nf_conntrack_core.h index cd55843c3605..10158011fd4d 100644 --- a/datapath/linux/compat/include/net/netfilter/nf_conntrack_core.h +++ b/datapath/linux/compat/include/net/netfilter/nf_conntrack_core.h @@ -67,27 +67,6 @@ static inline bool rpl_nf_ct_get_tuple(const struct sk_buff *skb, #define nf_ct_get_tuple rpl_nf_ct_get_tuple #endif /* HAVE_NF_CT_GET_TUPLEPR_TAKES_STRUCT_NET */ -/* Commit 08733a0cb7de ("netfilter: handle NF_REPEAT from nf_conntrack_in()") - * introduced behavioural changes to this function which cannot be detected - * in the headers. Unconditionally backport to kernels older than the one which - * contains this commit. */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(4,10,0) -static unsigned int rpl_nf_conntrack_in(struct net *net, u_int8_t pf, - unsigned int hooknum, - struct sk_buff *skb) -{ - int err; - - /* Repeat if requested, see nf_iterate(). */ - do { - err = nf_conntrack_in(net, pf, hooknum, skb); - } while (err == NF_REPEAT); - - return err; -} -#define nf_conntrack_in rpl_nf_conntrack_in -#endif /* < 4.10 */ - #ifdef HAVE_NF_CONN_TIMER #ifndef HAVE_NF_CT_DELETE