From patchwork Mon Feb 24 22:42:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 1243660 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=DgE4fZKO; 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 48RHCL043bz9sRQ for ; Tue, 25 Feb 2020 09:43:09 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 78E8E8699B; Mon, 24 Feb 2020 22:43: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 klMQ3olNyrob; Mon, 24 Feb 2020 22:43:02 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by whitealder.osuosl.org (Postfix) with ESMTP id 4DA2E86657; Mon, 24 Feb 2020 22:42:58 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 2F480C1D8A; Mon, 24 Feb 2020 22:42:58 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 24380C18DA for ; Mon, 24 Feb 2020 22:42:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 0FE3787766 for ; Mon, 24 Feb 2020 22:42:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nBnVlLu4D45s for ; Mon, 24 Feb 2020 22:42:55 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by hemlock.osuosl.org (Postfix) with ESMTPS id B07C187765 for ; Mon, 24 Feb 2020 22:42:55 +0000 (UTC) Received: by mail-pg1-f195.google.com with SMTP id 7so3784840pgr.2 for ; Mon, 24 Feb 2020 14:42:55 -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:in-reply-to:references; bh=FcDWzeAnrxD+wy6hBB/J3Px3Pg6fmoqz4o8LTtRtGjE=; b=DgE4fZKOnFWXUPvpkQydWyAmXpFG/x35LepaNhTIgJE1ITjzRVLpEHqbYLwM74795i Jd86VtPkT7Kof60KZCuhtQQjSGdD2lgjYfgHFJ1A+6RMOOiksoNXDYHsRRkcAD8CCV1d O9NxvbdV/++OnPHq7L61dtNFLkYGVzVZqXATe+FDZt3aWGEnNxO2OLkKJPyvCkCvIcNU QdH/krFfczUHzQSXSIY/0XllZx46H965CJvO6NcUmuUBmbbbObIDY/l5qh0YrA+F0m+l f+edG6gdfbql6N9lYv/PsYly5DRU03QIA6ZABZMNafeLQ9Y+BqykwJRBKK8h5/VwF9SH KLWg== 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=FcDWzeAnrxD+wy6hBB/J3Px3Pg6fmoqz4o8LTtRtGjE=; b=jSuMCJl0BngiKLWr0PqwQNiSwgdE4SiKXb5a9nMZDojrn5groRCfT+itPGPfFyGCR/ yO/e8jidxZFbEC2Uj48aQlFFtWzfD7vo8l9Id6bOozp11VzEbdkv/eI4F9fZcCcWXURR QBoqQD9hfbj2ciyrEtcTMJQNueSt11p+9eDetcWug7OZ7DNuXS4ox+/bZezC80unjm8T yk8osMA3thXZDWD7y/T7FiCzostgfXaJmYFI8rS8Kzzm9b0lxSlS9ooNE6koPbA8PyFf yhodoYs/QUApCodOPtjNs7/GMIiSZ7Ja9SRd9dU6/enrWDf7JyDPUAP0kGSuQ14+ZgKZ XLXw== X-Gm-Message-State: APjAAAWr31q5BS8bmmsUemPLqcncWa2tN19a4DGQ2h7+wm5ZTRmg/onj r25wp2q2w1yKE2hr0HlgyRwcM4p6rak= X-Google-Smtp-Source: APXvYqxZfMlseEK0zpatSiSXiBoNms/4mOi4Raf31z9ctHho56ZFopO6TWjiLfKVwH6BYC8/XhOraA== X-Received: by 2002:aa7:84cd:: with SMTP id x13mr56012345pfn.130.1582584175043; Mon, 24 Feb 2020 14:42:55 -0800 (PST) Received: from gizo.domain (97-115-113-182.ptld.qwest.net. [97.115.113.182]) by smtp.gmail.com with ESMTPSA id 133sm14320705pfy.14.2020.02.24.14.42.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Feb 2020 14:42:54 -0800 (PST) From: Greg Rose To: dev@openvswitch.org Date: Mon, 24 Feb 2020 14:42:35 -0800 Message-Id: <1582584158-16348-6-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1582584158-16348-1-git-send-email-gvrose8192@gmail.com> References: <1582584158-16348-1-git-send-email-gvrose8192@gmail.com> Subject: [ovs-dev] [PATCH 6/9] compat: Add FIELD_SIZEOF macro 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" The FIELD_SIZEOF macro is removed in Linux kernel release 5.5 but is still needed in our out of tree kernel module for compatibility with older kernels. Signed-off-by: Greg Rose --- datapath/linux/compat/include/linux/kernel.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/datapath/linux/compat/include/linux/kernel.h b/datapath/linux/compat/include/linux/kernel.h index 2e81abc..8529b1d 100644 --- a/datapath/linux/compat/include/linux/kernel.h +++ b/datapath/linux/compat/include/linux/kernel.h @@ -32,4 +32,8 @@ #define U32_MAX ((u32)~0U) #endif +#ifndef FIELD_SIZEOF +#define FIELD_SIZEOF(t, f) (sizeof(((t*)0)->f)) +#endif + #endif /* linux/kernel.h */