Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 24 Mar 2021 22:30:37 GMT
From:      "Bjoern A. Zeeb" <bz@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: de8a7cc703f1 - main - linuxkpi: add ieee80211_node.h to headers to include before LIST_HEAD
Message-ID:  <202103242230.12OMUbOC075373@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by bz:

URL: https://cgit.FreeBSD.org/src/commit/?id=de8a7cc703f1d3eab293d53fbc8269e1aca3a6ab

commit de8a7cc703f1d3eab293d53fbc8269e1aca3a6ab
Author:     Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2021-03-18 22:23:15 +0000
Commit:     Bjoern A. Zeeb <bz@FreeBSD.org>
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 <sys/mbuf.h>
 
 #include <net/bpf.h>
+#include <net/ethernet.h>
 #include <net/if.h>
 #include <net/if_var.h>
 #include <net/if_types.h>
@@ -67,6 +68,10 @@
 #include <netinet6/in6_var.h>
 #include <netinet6/nd6.h>
 
+#include <net80211/ieee80211.h>
+#include <net80211/ieee80211_var.h>
+#include <net80211/ieee80211_node.h>
+
 #include <vm/vm.h>
 #include <vm/vm_object.h>
 #include <vm/pmap.h>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103242230.12OMUbOC075373>