From patchwork Tue Mar 24 15:42:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 1260796 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.166.137; helo=fraxinus.osuosl.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.a=rsa-sha256 header.s=20161025 header.b=R9OKJsE8; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48mwVH6pfkz9sSJ for ; Wed, 25 Mar 2020 02:42:15 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id B2DAC862C7; Tue, 24 Mar 2020 15:42:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pZtr5DoDXlYb; Tue, 24 Mar 2020 15:42:10 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by fraxinus.osuosl.org (Postfix) with ESMTP id E5B488506A; Tue, 24 Mar 2020 15:42:10 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id CFC62C089F; Tue, 24 Mar 2020 15:42:10 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id D10B6C0177 for ; Tue, 24 Mar 2020 15:42:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C03F687D5D for ; Tue, 24 Mar 2020 15:42:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Uso0CCVdEe3G for ; Tue, 24 Mar 2020 15:42:08 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by whitealder.osuosl.org (Postfix) with ESMTPS id 3ED8F87688 for ; Tue, 24 Mar 2020 15:42:08 +0000 (UTC) Received: by mail-pf1-f194.google.com with SMTP id d25so9436857pfn.6 for ; Tue, 24 Mar 2020 08:42:08 -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=ZS4lmPIT8qO+W1fSGeiVmxeDMuxTwpoGfkiAfZVxO2A=; b=R9OKJsE87JccfFlnFcixvIl5iiNLL54hvK/qOe+3GSPkF7CUmHquD/W/Wjz1WDr468 Z6b+f13RZ44VM6tfO3eklrd/3HptzF/S36aHrdUSoqTeyrF7SFUAHrIijYHG75wjmczS nE1seHSaEG2kZEOfmVO8KdOhyPjDSP54V9djfxSPky9QSUEHyRvXbHVIp4DkRQtkDzCL Hb2UP1CkEH7T6cjlgMblAQKfJ/GuQQ1DOV/29qaxmW9rEvUtqs+3LuET+PbW81uhxdIW KnludAvsjNmgWPoFnsg8f69L2a8PRxj/N4uUFrYX05QIhObYRHp5peQ/t7+S0ZPpZKe9 2SXg== 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=ZS4lmPIT8qO+W1fSGeiVmxeDMuxTwpoGfkiAfZVxO2A=; b=cxr9DM0oIKYZxbGgBvpeJQRNvGKmX54HA1B7GYIox5j8TJ3Bp+Jk9ngF8/tzGoq805 P4NpmKvdwmJjiWjDwsa8uOC3985JcUiO9jWgV+5+ORv66OmOCQTuA3+EZZUBC88+j+UV 0ZH98yIGmWY4JllVRAlDpBHH5CT2aih1hbGKJyM7Eo3RwPDbHlPzf8cDW0o6N/cWs0yI fMJ2wEgcsf7TBKgAu4GbIFXsYYFGRpOaPsCJONJdhMS2ECqI5VmtNW31EkbkNDsP7UoJ VN93ebamHh0eS2WwgIuKZh5SPWooE0u34Ma57PnSHtHh/+zlnyloX73dbCgB1S+GV2lR hLIw== X-Gm-Message-State: ANhLgQ1wV3ooWV4EMrKsm6C16gOmAvLjW1Bq8xWafhCc0C3VR4t994tB +vT8BH/5EarWms/o4CvcqupkKp7sHK4= X-Google-Smtp-Source: ADFU+vsWEBclJo004dg+HnJSwoBzKS0qHNjQwkzg+5nMnYhqWr55nQbGWZV1MuA5uXppIJfA4CvHmg== X-Received: by 2002:a63:d255:: with SMTP id t21mr27232251pgi.114.1585064526937; Tue, 24 Mar 2020 08:42:06 -0700 (PDT) Received: from gizo.domain ([97.115.142.52]) by smtp.gmail.com with ESMTPSA id o11sm14927411pgh.78.2020.03.24.08.42.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Mar 2020 08:42:06 -0700 (PDT) From: Greg Rose To: dev@openvswitch.org Date: Tue, 24 Mar 2020 08:42:02 -0700 Message-Id: <1585064523-18522-1-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 Cc: Greg Rose Subject: [ovs-dev] [PATCH V2 1/2] compat: Fix nf_ip_hook parameters for RHEL 8 X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" From: Greg Rose A RHEL release version check was only checking for RHEL releases greater than 7.0 so that ended up including a compat fixup that is not needed for 8.0. Fix up the version check. Signed-off-by: Greg Rose Acked-by: Yi-Hung Wei --- datapath/linux/compat/stt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datapath/linux/compat/stt.c b/datapath/linux/compat/stt.c index 7b46d1a..8a5853f 100644 --- a/datapath/linux/compat/stt.c +++ b/datapath/linux/compat/stt.c @@ -1559,7 +1559,7 @@ static void clean_percpu(struct work_struct *work) #endif #ifdef HAVE_NF_HOOK_STATE -#if RHEL_RELEASE_CODE > RHEL_RELEASE_VERSION(7,0) +#if RHEL_RELEASE_CODE > RHEL_RELEASE_VERSION(7,0) && RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(8,0) /* RHEL nfhook hacks. */ #ifndef __GENKSYMS__ #define LAST_PARAM const struct net_device *in, const struct net_device *out, \