freebsd11_wlan -> freebsd_wlan.
FreeBSD 12's net80211 layer contains only 2 small KPI breaks from FreeBSD 11, so we can upgrade it, apply those 2 changes to the drivers which are affected (as the changes are in some lesser-used functions), and then upgrade all drivers one at a time.
This commit is contained in:
Augustin Cavalier
@@ -68,7 +68,7 @@ CopyDirectoryToPackage develop headers private libs compat
|
||||
: [ FDirName $(HAIKU_TOP) src libs compat freebsd_network ]
|
||||
: : -x *.c -x *.cpp -x *.awk -x Jamfile -x miidevs -x usbdevs ;
|
||||
CopyDirectoryToPackage develop headers private libs compat
|
||||
: [ FDirName $(HAIKU_TOP) src libs compat freebsd11_wlan ]
|
||||
: [ FDirName $(HAIKU_TOP) src libs compat freebsd_wlan ]
|
||||
: : -x *.c -x Jamfile ;
|
||||
|
||||
# create be -> os symlink for now
|
||||
|
||||
@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src add-ons kernel drivers network wlan aironetwifi ;
|
||||
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
|
||||
: true ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_wlan ] : true ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_wlan ] : true ;
|
||||
UsePrivateHeaders net system ;
|
||||
UsePrivateKernelHeaders ;
|
||||
|
||||
@@ -20,6 +20,6 @@ KernelAddon aironetwifi :
|
||||
if_an_pci.c
|
||||
glue.c
|
||||
:
|
||||
libfreebsd11_wlan.a
|
||||
freebsd_wlan.a
|
||||
libfreebsd_network.a
|
||||
;
|
||||
|
||||
@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src add-ons kernel drivers network wlan atheroswifi ;
|
||||
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
|
||||
: true ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_wlan ] : true ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_wlan ] : true ;
|
||||
UsePrivateHeaders net system ;
|
||||
UsePrivateKernelHeaders ;
|
||||
|
||||
@@ -45,7 +45,7 @@ KernelAddon atheroswifi :
|
||||
atheroswifi_hal.o
|
||||
atheroswifi_rate.o
|
||||
:
|
||||
libfreebsd11_wlan.a
|
||||
freebsd_wlan.a
|
||||
libfreebsd_network.a
|
||||
;
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src add-ons kernel drivers network wlan broadcom43xx ;
|
||||
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
|
||||
: true ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_wlan ] : true ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_wlan ] : true ;
|
||||
UsePrivateHeaders net system ;
|
||||
UsePrivateKernelHeaders ;
|
||||
|
||||
@@ -28,6 +28,6 @@ KernelAddon broadcom43xx :
|
||||
bwirf.c
|
||||
glue.c
|
||||
:
|
||||
libfreebsd11_wlan.a
|
||||
freebsd_wlan.a
|
||||
libfreebsd_network.a
|
||||
;
|
||||
|
||||
@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src add-ons kernel drivers network wlan idualwifi7260 ;
|
||||
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
|
||||
: true ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_wlan ] : true ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_wlan ] : true ;
|
||||
UsePrivateHeaders net system ;
|
||||
UsePrivateKernelHeaders ;
|
||||
|
||||
@@ -34,7 +34,7 @@ KernelAddon idualwifi7260 :
|
||||
if_iwm.c
|
||||
glue.c
|
||||
:
|
||||
libfreebsd11_wlan.a
|
||||
freebsd_wlan.a
|
||||
libfreebsd_network.a
|
||||
;
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src add-ons kernel drivers network wlan iprowifi2100 ;
|
||||
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
|
||||
: true ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_wlan ] : true ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_wlan ] : true ;
|
||||
UsePrivateHeaders net system ;
|
||||
UsePrivateKernelHeaders ;
|
||||
|
||||
@@ -19,7 +19,7 @@ KernelAddon iprowifi2100 :
|
||||
if_ipw.c
|
||||
glue.c
|
||||
:
|
||||
libfreebsd11_wlan.a
|
||||
freebsd_wlan.a
|
||||
libfreebsd_network.a
|
||||
;
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src add-ons kernel drivers network wlan iprowifi2200 ;
|
||||
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
|
||||
: true ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_wlan ] : true ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_wlan ] : true ;
|
||||
UsePrivateHeaders net system ;
|
||||
UsePrivateKernelHeaders ;
|
||||
|
||||
@@ -23,7 +23,7 @@ KernelAddon iprowifi2200 :
|
||||
if_iwi.c
|
||||
glue.c
|
||||
:
|
||||
libfreebsd11_wlan.a
|
||||
freebsd_wlan.a
|
||||
libfreebsd_network.a
|
||||
;
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src add-ons kernel drivers network wlan iprowifi3945 ;
|
||||
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
|
||||
: true ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_wlan ] : true ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_wlan ] : true ;
|
||||
UsePrivateHeaders net system ;
|
||||
UsePrivateKernelHeaders ;
|
||||
|
||||
@@ -19,7 +19,7 @@ KernelAddon iprowifi3945 :
|
||||
if_wpi.c
|
||||
glue.c
|
||||
:
|
||||
libfreebsd11_wlan.a
|
||||
freebsd_wlan.a
|
||||
libfreebsd_network.a
|
||||
;
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src add-ons kernel drivers network wlan iprowifi4965 ;
|
||||
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
|
||||
: true ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_wlan ] : true ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_wlan ] : true ;
|
||||
UsePrivateHeaders net system ;
|
||||
UsePrivateKernelHeaders ;
|
||||
|
||||
@@ -19,7 +19,7 @@ KernelAddon iprowifi4965 :
|
||||
if_iwn.c
|
||||
glue.c
|
||||
:
|
||||
libfreebsd11_wlan.a
|
||||
freebsd_wlan.a
|
||||
libfreebsd_network.a
|
||||
;
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src add-ons kernel drivers network wlan marvell88w8335 ;
|
||||
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
|
||||
: true ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_wlan ] : true ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_wlan ] : true ;
|
||||
UsePrivateHeaders net system ;
|
||||
UsePrivateKernelHeaders ;
|
||||
|
||||
@@ -21,6 +21,6 @@ KernelAddon marvell88w8335 :
|
||||
if_malohal.c
|
||||
glue.c
|
||||
:
|
||||
libfreebsd11_wlan.a
|
||||
freebsd_wlan.a
|
||||
libfreebsd_network.a
|
||||
;
|
||||
|
||||
@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src add-ons kernel drivers network wlan marvell88w8363 ;
|
||||
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
|
||||
: true ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_wlan ] : true ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_wlan ] : true ;
|
||||
UsePrivateHeaders net system ;
|
||||
UsePrivateKernelHeaders ;
|
||||
|
||||
@@ -22,7 +22,7 @@ KernelAddon marvell88w8363 :
|
||||
mwlhal.c
|
||||
glue.c
|
||||
:
|
||||
libfreebsd11_wlan.a
|
||||
freebsd_wlan.a
|
||||
libfreebsd_network.a
|
||||
;
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src add-ons kernel drivers network wlan ralinkwifi ;
|
||||
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
|
||||
: true ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_wlan ] : true ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_wlan ] : true ;
|
||||
UsePrivateHeaders net system ;
|
||||
UsePrivateKernelHeaders ;
|
||||
|
||||
@@ -22,7 +22,7 @@ KernelAddon ralinkwifi :
|
||||
rt2860.c
|
||||
glue.c
|
||||
:
|
||||
libfreebsd11_wlan.a
|
||||
freebsd_wlan.a
|
||||
libfreebsd_network.a
|
||||
;
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src add-ons kernel drivers network wlan realtekwifi ;
|
||||
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
|
||||
: true ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_wlan ] : true ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_wlan ] : true ;
|
||||
UsePrivateHeaders net system ;
|
||||
UsePrivateKernelHeaders ;
|
||||
|
||||
@@ -19,7 +19,7 @@ KernelAddon realtekwifi :
|
||||
if_rtwn.c
|
||||
glue.c
|
||||
:
|
||||
libfreebsd11_wlan.a
|
||||
freebsd_wlan.a
|
||||
libfreebsd_network.a
|
||||
;
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src add-ons kernel drivers network wlan wavelanwifi ;
|
||||
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
|
||||
: true ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_wlan ] : true ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_wlan ] : true ;
|
||||
UsePrivateHeaders net system ;
|
||||
UsePrivateKernelHeaders ;
|
||||
|
||||
@@ -24,6 +24,6 @@ KernelAddon wavelanwifi :
|
||||
if_wi_pci.c
|
||||
glue.c
|
||||
:
|
||||
libfreebsd11_wlan.a
|
||||
freebsd_wlan.a
|
||||
libfreebsd_network.a
|
||||
;
|
||||
|
||||
@@ -3,7 +3,7 @@ SubDir HAIKU_TOP src bin network ifconfig ;
|
||||
UsePrivateHeaders net ;
|
||||
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat ] : true ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_wlan ] : true ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_wlan ] : true ;
|
||||
|
||||
SubDirC++Flags [ FDefines _BSD_SOURCE=1 ] ;
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ UsePrivateHeaders app net shared storage support ;
|
||||
UsePrivateHeaders locale shared ;
|
||||
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network ] : true ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_wlan ] : true ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_wlan ] : true ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) headers os add-ons network_settings ]
|
||||
: true ;
|
||||
|
||||
|
||||
@@ -2,4 +2,4 @@ SubDir HAIKU_TOP src libs compat ;
|
||||
|
||||
SubInclude HAIKU_TOP src libs compat freebsd_network ;
|
||||
SubInclude HAIKU_TOP src libs compat freebsd_iflib ;
|
||||
SubInclude HAIKU_TOP src libs compat freebsd11_wlan ;
|
||||
SubInclude HAIKU_TOP src libs compat freebsd_wlan ;
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
SubDir HAIKU_TOP src libs compat freebsd11_wlan ;
|
||||
|
||||
SubInclude HAIKU_TOP src libs compat freebsd11_wlan net80211 ;
|
||||
@@ -0,0 +1,3 @@
|
||||
SubDir HAIKU_TOP src libs compat freebsd_wlan ;
|
||||
|
||||
SubInclude HAIKU_TOP src libs compat freebsd_wlan net80211 ;
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
SubDir HAIKU_TOP src libs compat freebsd11_wlan net80211 ;
|
||||
SubDir HAIKU_TOP src libs compat freebsd_wlan net80211 ;
|
||||
|
||||
UseHeaders [ FDirName $(SUBDIR) .. .. freebsd_network ] : true ;
|
||||
UseHeaders [ FDirName $(SUBDIR) .. .. freebsd_network compat ] : true ;
|
||||
@@ -18,7 +18,7 @@ SubDirC++Flags [ FDefines _KERNEL=1 FBSD_DRIVER=1 ]
|
||||
|
||||
SEARCH_SOURCE += [ FDirName $(SUBDIR) .. crypto rijndael ] ;
|
||||
|
||||
KernelStaticLibrary libfreebsd11_wlan.a :
|
||||
KernelStaticLibrary freebsd_wlan.a :
|
||||
ieee80211.c
|
||||
ieee80211_action.c
|
||||
ieee80211_adhoc.c
|
||||
@@ -3,7 +3,7 @@ SubDir HAIKU_TOP src servers net ;
|
||||
UsePrivateHeaders app net shared storage ;
|
||||
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat ] : true ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd11_wlan ] : true ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_wlan ] : true ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) headers os add-ons network_settings ]
|
||||
: true ;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user