git: 19807ebec668 - stable/13 - linuxkpi: add ieee80211_node.h to headers to include before LIST_HEAD

Bjoern A. Zeeb bz at FreeBSD.org
Sun Jul 18 00:35:52 UTC 2021


The branch stable/13 has been updated by bz:

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

commit 19807ebec668cd1038680bf2ae4f64061bea15ce
Author:     Bjoern A. Zeeb <bz at FreeBSD.org>
AuthorDate: 2021-03-18 22:23:15 +0000
Commit:     Bjoern A. Zeeb <bz at FreeBSD.org>
CommitDate: 2021-07-18 00:34:58 +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
    Reviewed by:    philip, hselasky
    Differential Revision:  https://reviews.freebsd.org/D29336
    
    (cherry picked from commit de8a7cc703f1d3eab293d53fbc8269e1aca3a6ab)
---
 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 977207376c45..93db449a4473 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>


More information about the dev-commits-src-all mailing list