From 339eef51313b0fe47e5f5e086f75d3a0f46d3b75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Wed, 19 Dec 2018 12:34:59 +0000 Subject: [PATCH] Revert "net_server: Add (more) missing devices even if one has already been found." MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit def61273ed29e944a48064bac18537652f9ef81a. This isn't a fix for the issue, it will just throw away all settings. Change-Id: I2979c02c54f9379f25dc5d41d3a6085c09e87ac3 Reviewed-on: https://review.haiku-os.org/785 Reviewed-by: Axel Dörfler --- src/servers/net/NetServer.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/servers/net/NetServer.cpp b/src/servers/net/NetServer.cpp index f70f567673..192bd0b8d3 100644 --- a/src/servers/net/NetServer.cpp +++ b/src/servers/net/NetServer.cpp @@ -769,9 +769,11 @@ NetServer::_BringUpInterfaces() // TODO: also check if the networking driver is correctly initialized! // (and check for other devices to take over its configuration) - // if a missing device has been found, add it to /dev/net - _ConfigureDevices("/dev/net", - missingDevice.HasString("device") ? &missingDevice : NULL); + if (!_TestForInterface("/dev/net/")) { + // there is no driver configured - see if there is one and try to use it + _ConfigureDevices("/dev/net", + missingDevice.HasString("device") ? &missingDevice : NULL); + } }