From patchwork Wed Oct 16 20:21:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 1178151 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=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="Y0EII1vq"; 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 46tkGM2WtHz9sNw for ; Thu, 17 Oct 2019 07:21:29 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 564EFD7A; Wed, 16 Oct 2019 20:21:26 +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 2E217D56 for ; Wed, 16 Oct 2019 20:21:25 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id E1DC813A for ; Wed, 16 Oct 2019 20:21:24 +0000 (UTC) Received: by mail-pf1-f193.google.com with SMTP id q7so85680pfh.8 for ; Wed, 16 Oct 2019 13:21:24 -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; bh=cvMwPM5WCUz0ABd6XJdBWz6Gf9M/R9YJeIeMa40xt3s=; b=Y0EII1vq0YDyYHuVaaWyCTcFo+I63T1AYcuNL+1Gx5uTipA0VB9TNhET5+Ieo5od6u FsnjW5A1WULUATRU7Yt+Yfsx6J5HXY1YqJ3gG4u6KPMXQADuB5Axev69UaULJhcsLPy0 585xBiabjZsCmiRGXaODMVNVHaaVyODVM5BbizRSOUqcL08lLxFyzdbTdr6+5Kdt9DQ4 8uMveUXhstzYIjFgm8EEDx2LOGZwCsXBoJFuFE61oDA0rSCb9CcU2VDKPTZUy1ONhMGL jNEkKxtRXmZI4IKPgLb2LOr9J/UCI+imEroV6rwUyB6NPAs95BbcOM14Kn/P3jvcmudP NYdA== 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; bh=cvMwPM5WCUz0ABd6XJdBWz6Gf9M/R9YJeIeMa40xt3s=; b=C0afVqamxLF2FCR74ktIZ41Q5yzSxOx9Q/Ku3zNGSnjcTo8dEmMuy2IPJpVeRbRc3p jCe/V30WH4J6zGoNiVPC18x/GL41edjrLEvWM32ymaMEOXjujOr193owQ4eZ/5Pgc+ff UT8dlb5a8FiMSn/jCyZlur7cmrtAW1CKgw1k2hKW2tlRnUgkh8BdPH9ACe8uT3wbbP5a k/dxd1tKv216iBINrCJ4cABfUI4RmIiwiE0pGqpDkcdlNs4hqQsDitMskdcNKlWlGBt/ fN/hsq+XfzGONIUOr6p8Du8Up4vvtT82GYxPuZbWKyyruai5KOGggkkl5iACJu84oFBU mruw== X-Gm-Message-State: APjAAAUyxMZmQi2uP+vrS7ElI2ZvSRgF4Vo1zGGoXj6dFGSxwvXMSjGH EbkHIy91msnSdLcZwVYazbg3nT4oGAc= X-Google-Smtp-Source: APXvYqxCynpywb/K7u9Uy5uZFD3hvA6MkVsqYdyZxaKAOQjaSGtSsIeHTqHqWQDXWjDAmDpaL2rzeg== X-Received: by 2002:a62:e206:: with SMTP id a6mr46829329pfi.64.1571257283913; Wed, 16 Oct 2019 13:21:23 -0700 (PDT) Received: from gizo.domain (97-115-119-26.ptld.qwest.net. [97.115.119.26]) by smtp.gmail.com with ESMTPSA id a11sm29187766pfg.94.2019.10.16.13.21.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Oct 2019 13:21:16 -0700 (PDT) From: Greg Rose To: dev@openvswitch.org Date: Wed, 16 Oct 2019 13:21:11 -0700 Message-Id: <1571257271-4240-1-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH] compat: Fix small naming issue 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 In commit 057772cf2477 the function is missing the rpl_ prefix and the define that replaces the original function should come after the function definition. Fixes: 057772cf2477 ("compat: Backport nf_ct_tmpl_alloc().") Signed-off-by: Greg Rose Reviewed-by: Yifeng Sun --- datapath/linux/compat/include/net/netfilter/nf_conntrack_core.h | 6 +++--- 1 file changed, 3 insertions(+), 3 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 1015801..84cb09e 100644 --- a/datapath/linux/compat/include/net/netfilter/nf_conntrack_core.h +++ b/datapath/linux/compat/include/net/netfilter/nf_conntrack_core.h @@ -7,11 +7,10 @@ #include -#define nf_ct_tmpl_alloc rpl_nf_ct_tmpl_alloc /* Released via destroy_conntrack() */ static inline struct nf_conn * -nf_ct_tmpl_alloc(struct net *net, const struct nf_conntrack_zone *zone, - gfp_t flags) +rpl_nf_ct_tmpl_alloc(struct net *net, const struct nf_conntrack_zone *zone, + gfp_t flags) { struct nf_conn *tmpl; @@ -32,6 +31,7 @@ out_free: kfree(tmpl); return NULL; } +#define nf_ct_tmpl_alloc rpl_nf_ct_tmpl_alloc static void rpl_nf_ct_tmpl_free(struct nf_conn *tmpl) {