From patchwork Thu Jan 30 23:55:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 1231706 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.138; helo=whitealder.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=b3Qvmi6M; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 487y0c5jsRz9sPW for ; Fri, 31 Jan 2020 10:55:43 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0EA358733E; Thu, 30 Jan 2020 23:55:41 +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 C2C6Q3cG7UtJ; Thu, 30 Jan 2020 23:55:40 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by whitealder.osuosl.org (Postfix) with ESMTP id 3A36A826AC; Thu, 30 Jan 2020 23:55:40 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 175D1C1796; Thu, 30 Jan 2020 23:55:40 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id A9DEDC0171 for ; Thu, 30 Jan 2020 23:55:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 91ECA8692F for ; Thu, 30 Jan 2020 23:55:38 +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 rJZibUK9cn_r for ; Thu, 30 Jan 2020 23:55:38 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 1E15C86928 for ; Thu, 30 Jan 2020 23:55:38 +0000 (UTC) Received: by mail-pg1-f194.google.com with SMTP id l24so2492550pgk.2 for ; Thu, 30 Jan 2020 15:55:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=wQkf/1uFhfNe9gTKdOIU1xRarALJH1fA2kXwTQ5ScMU=; b=b3Qvmi6MPXf8pzqIjpDNBI3W1I0YSyLqbTq8FNfY1+ObZluG8jQ5eGzlqx252CrbIn npYW1djop28TzQSHs5PT17ohJCyzpJtrFlQQk3dtPeNKVxuEy0JZIU/q5RsWdyNEhw5X ayUjTW/wdDqnylkWJAbMmJfPSNhrvx4VtKQTHVjCaX79XLcjZQu+g75qFsxyVpdRX7dg AZG1CveU/mj9bCkrzp5F3ewlmr5+SgYmYhIv3aoaleaepfsWPMX019Uk71/vsw6WsW/T BSZAJ06INdVOwpgsb4f/FmvKl7nQwLtdvH4gI1pny/yFoFJZ+dXExjAuKYroKwokhWs4 9uqQ== 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=wQkf/1uFhfNe9gTKdOIU1xRarALJH1fA2kXwTQ5ScMU=; b=UOO7pO6zF7NJbJoxIb2atFEGKDAVZATHuy7ds4p72rmXFCIsF04yOLTuHgCSmYESoW Jd/L+mSySK2WWjm48xY/bXGm57kLi0Y1uwGvqf+M85pcuUBcOQ9r6hf+sxr2Q1oeSIXs ay2dam+gTKY7bNP1ckeZ+832GRgO/Xurd157FzGC/n6hoo7ycmUZnftfmoJra4Oyemxh snR49Xjn7bBUJxISz7ppxB40K4C/VQ7DxqXdnhh15zf51UsQlJgx9bfJOvd4ztG/Up8U fUpuPB20W+suduGmOoq/NjPNZSzHlJ8UPPiUhALumYqHuApJfeNJ4khwfIbZVqRCF7a1 hxpA== X-Gm-Message-State: APjAAAVDuTcPXe+TYF+xcmvIA+WZxp6/pkYwj6p2HoyTYD+17Z0eo2cA AcxXM9zXp6+bAJSEWmHJsLEiwEnq X-Google-Smtp-Source: APXvYqw/XhR2FYXgnojSTGgkNr6JO0QJG8u8AO3y6YNeIiqpeBs2ZWYCoPO0sdqZ7jbO1+IIKODndw== X-Received: by 2002:aa7:8181:: with SMTP id g1mr7598309pfi.215.1580428537355; Thu, 30 Jan 2020 15:55:37 -0800 (PST) Received: from gizo.domain (97-115-104-237.ptld.qwest.net. [97.115.104.237]) by smtp.gmail.com with ESMTPSA id b15sm7581918pgh.40.2020.01.30.15.55.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Jan 2020 15:55:36 -0800 (PST) From: Greg Rose To: dev@openvswitch.org Date: Thu, 30 Jan 2020 15:55:27 -0800 Message-Id: <1580428527-29483-1-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [ovs-dev] [PATCH] compat: Remove HAVE_BOOL_TYPE 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" OVS only supports Linux kernels since 3.10 and all kernels since then have the bool type. This check is unnecessary so remove it. Passes Travis: https://travis-ci.org/gvrose8192/ovs-experimental/builds/644103253 Signed-off-by: Greg Rose --- acinclude.m4 | 2 -- datapath/linux/compat/include/linux/stddef.h | 7 ------- datapath/linux/compat/include/linux/types.h | 4 ---- 3 files changed, 13 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index c1470cc..1212a46 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -830,8 +830,6 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_nfct]) OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_put_zero]) - OVS_GREP_IFELSE([$KSRC/include/linux/types.h], [bool], - [OVS_DEFINE([HAVE_BOOL_TYPE])]) OVS_GREP_IFELSE([$KSRC/include/linux/types.h], [__wsum], [OVS_DEFINE([HAVE_CSUM_TYPES])]) OVS_GREP_IFELSE([$KSRC/include/uapi/linux/types.h], [__wsum], diff --git a/datapath/linux/compat/include/linux/stddef.h b/datapath/linux/compat/include/linux/stddef.h index f2b7c31..5b44c0d 100644 --- a/datapath/linux/compat/include/linux/stddef.h +++ b/datapath/linux/compat/include/linux/stddef.h @@ -5,13 +5,6 @@ #ifdef __KERNEL__ -#ifndef HAVE_BOOL_TYPE -enum { - false = 0, - true = 1 -}; -#endif /* !HAVE_BOOL_TYPE */ - #ifndef offsetofend #define offsetofend(TYPE, MEMBER) \ (offsetof(TYPE, MEMBER) + sizeof(((TYPE *)0)->MEMBER)) diff --git a/datapath/linux/compat/include/linux/types.h b/datapath/linux/compat/include/linux/types.h index b989d96..a58623e 100644 --- a/datapath/linux/compat/include/linux/types.h +++ b/datapath/linux/compat/include/linux/types.h @@ -8,8 +8,4 @@ typedef __u16 __bitwise __sum16; typedef __u32 __bitwise __wsum; #endif -#ifndef HAVE_BOOL_TYPE -typedef _Bool bool; -#endif /* !HAVE_BOOL_TYPE */ - #endif