From owner-dev-commits-src-main@freebsd.org Wed Mar 24 22:30:37 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9A0EF57965E; Wed, 24 Mar 2021 22:30:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F5NH1426Tz3KyK; Wed, 24 Mar 2021 22:30:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 792E01C281; Wed, 24 Mar 2021 22:30:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 12OMUbA8075374; Wed, 24 Mar 2021 22:30:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 12OMUbOC075373; Wed, 24 Mar 2021 22:30:37 GMT (envelope-from git) Date: Wed, 24 Mar 2021 22:30:37 GMT Message-Id: <202103242230.12OMUbOC075373@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: de8a7cc703f1 - main - linuxkpi: add ieee80211_node.h to headers to include before LIST_HEAD MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: de8a7cc703f1d3eab293d53fbc8269e1aca3a6ab Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Mar 2021 22:30:37 -0000 The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=de8a7cc703f1d3eab293d53fbc8269e1aca3a6ab commit de8a7cc703f1d3eab293d53fbc8269e1aca3a6ab Author: Bjoern A. Zeeb AuthorDate: 2021-03-18 22:23:15 +0000 Commit: Bjoern A. Zeeb CommitDate: 2021-03-24 22:19:34 +0000 linuxkpi: add ieee80211_node.h to headers to include before LIST_HEAD ieee80211_node.h uses LIST_HEAD() which LinuxKPI redefines and this can lead to problems (see comment there). Make sure the net80211 header file is handled correctly by adding it to the list of files to include before re-defining the macro. Also add header files needed as dependencies. Sponsored-by: The FreeBSD Foundation MFC-after: 2 weeks Reviewed-by: philip, hselasky Differential Revision: https://reviews.freebsd.org/D29336 --- sys/compat/linuxkpi/common/include/linux/list.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/list.h b/sys/compat/linuxkpi/common/include/linux/list.h index 1f3db8e43a08..37b5b751d21b 100644 --- a/sys/compat/linuxkpi/common/include/linux/list.h +++ b/sys/compat/linuxkpi/common/include/linux/list.h @@ -53,6 +53,7 @@ #include #include +#include #include #include #include @@ -67,6 +68,10 @@ #include #include +#include +#include +#include + #include #include #include