i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

freebsd11_network: Only start_wlan if FBSD_WLAN_FEATURE is required.

Browse Source 
Fixes #8634.
This commit is contained in:
Augustin Cavalier
2018-07-10 18:40:21 -04:00
parent 77cf476567
commit 1a35344427
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/compat/freebsd11_network/compat.c
+5 -3
View File
@@ -453,7 +453,7 @@ device_attach(device_t device)
if (result == 0) if (result == 0)
atomic_or(&device->flags, DEVICE_ATTACHED); atomic_or(&device->flags, DEVICE_ATTACHED);
if (result == 0) if (result == 0 && HAIKU_DRIVER_REQUIRES(FBSD_WLAN_FEATURE))
result = start_wlan(device); result = start_wlan(device);
return result; return result;
@@ -467,8 +467,10 @@ device_detach(device_t device)
return B_ERROR; return B_ERROR;
if ((atomic_and(&device->flags, ~DEVICE_ATTACHED) & DEVICE_ATTACHED) != 0 if ((atomic_and(&device->flags, ~DEVICE_ATTACHED) & DEVICE_ATTACHED) != 0
&& device->methods.detach != NULL) { && device->methods.detach != NULL) {
int result = stop_wlan(device); int result = 0;
if (HAIKU_DRIVER_REQUIRES(FBSD_WLAN_FEATURE))
result = stop_wlan(device);
if (result != 0) { if (result != 0) {
atomic_or(&device->flags, DEVICE_ATTACHED); atomic_or(&device->flags, DEVICE_ATTACHED);
return result; return result;