From 115dc5264b7ccb8784e936780b3117096fb9767b Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 10 Oct 2005 18:00:59 +0000 Subject: [PATCH] 2005-10-10 Dan Williams * Remove nm_system_load_device_modules() from backend files and from NetworkManager.c git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1014 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 5 +++++ src/NetworkManager.c | 8 -------- src/NetworkManagerSystem.h | 1 - src/backends/NetworkManagerDebian.c | 12 ------------ src/backends/NetworkManagerGentoo.c | 14 -------------- src/backends/NetworkManagerRedHat.c | 13 ------------- src/backends/NetworkManagerSlackware.c | 11 ----------- src/backends/NetworkManagerSuSE.c | 11 ----------- 8 files changed, 5 insertions(+), 70 deletions(-) diff --git a/ChangeLog b/ChangeLog index a2997e503e..a093c697ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-10-10 Dan Williams + + * Remove nm_system_load_device_modules() from backend files + and from NetworkManager.c + 2005-10-10 Dan Williams * src/NetworkManagerPolicy.c diff --git a/src/NetworkManager.c b/src/NetworkManager.c index 5f0017ba8a..6b272bace3 100644 --- a/src/NetworkManager.c +++ b/src/NetworkManager.c @@ -887,14 +887,6 @@ int main( int argc, char *argv[] ) nm_system_init(); - /* Load all network device kernel modules. - * NOTE: this hack is temporary until device modules get loaded - * on startup by something else. The problem is that unless - * the module is loaded, HAL doesn't know its a network device, - * and therefore can't tell us about it. - */ - nm_system_load_device_modules (); - /* Initialize our instance data */ nm_data = nm_data_new (enable_test_devices); if (!nm_data) diff --git a/src/NetworkManagerSystem.h b/src/NetworkManagerSystem.h index 5a06c801dd..fad8432a4e 100644 --- a/src/NetworkManagerSystem.h +++ b/src/NetworkManagerSystem.h @@ -51,7 +51,6 @@ void nm_system_delete_default_route (void); void nm_system_flush_arp_cache (void); void nm_system_kill_all_dhcp_daemons (void); void nm_system_update_dns (void); -void nm_system_load_device_modules (void); void nm_system_restart_mdns_responder (void); void nm_system_device_add_ip6_link_address (NMDevice *dev); diff --git a/src/backends/NetworkManagerDebian.c b/src/backends/NetworkManagerDebian.c index 55387d63e1..e11fd11d40 100644 --- a/src/backends/NetworkManagerDebian.c +++ b/src/backends/NetworkManagerDebian.c @@ -360,18 +360,6 @@ void nm_system_update_dns (void) } -/* - * nm_system_load_device_modules - * - * This is a null op - all our drivers should already be loaded. - * - */ -void nm_system_load_device_modules (void) -{ - return; -} - - /* * nm_system_restart_mdns_responder * diff --git a/src/backends/NetworkManagerGentoo.c b/src/backends/NetworkManagerGentoo.c index 15c54ea83c..c85bd94502 100644 --- a/src/backends/NetworkManagerGentoo.c +++ b/src/backends/NetworkManagerGentoo.c @@ -236,20 +236,6 @@ void nm_system_update_dns (void) #endif } -/* - * nm_system_load_device_modules - * - * Loads any network adapter kernel modules, these should already be loaded - * by /etc/modules.autoload.d/kernel-2.x - * - * Gentoo should have all modules loaded. - */ -void nm_system_load_device_modules (void) -{ -} - - - /* * nm_system_restart_mdns_responder * diff --git a/src/backends/NetworkManagerRedHat.c b/src/backends/NetworkManagerRedHat.c index 55132bcd51..c10a05ae44 100644 --- a/src/backends/NetworkManagerRedHat.c +++ b/src/backends/NetworkManagerRedHat.c @@ -282,19 +282,6 @@ void nm_system_update_dns (void) } -/* - * nm_system_load_device_modules - * - * Load any network adapter kernel modules that we need to, since Fedora doesn't - * autoload them at this time. - * - */ -void nm_system_load_device_modules (void) -{ - nm_spawn_process ("/usr/bin/NMLoadModules"); -} - - /* * nm_system_restart_mdns_responder * diff --git a/src/backends/NetworkManagerSlackware.c b/src/backends/NetworkManagerSlackware.c index 218e786dab..8c8cbe48bb 100644 --- a/src/backends/NetworkManagerSlackware.c +++ b/src/backends/NetworkManagerSlackware.c @@ -164,17 +164,6 @@ void nm_system_update_dns (void) } -/* - * nm_system_load_device_modules - * - * These should already be loaded - * - */ -void nm_system_load_device_modules (void) -{ -} - - /* * nm_system_restart_mdns_responder * diff --git a/src/backends/NetworkManagerSuSE.c b/src/backends/NetworkManagerSuSE.c index 673d365062..65f18f9179 100644 --- a/src/backends/NetworkManagerSuSE.c +++ b/src/backends/NetworkManagerSuSE.c @@ -275,17 +275,6 @@ void nm_system_update_dns (void) } -/* - * nm_system_load_device_modules - * - * Load any network adapter kernel modules that we need. - * - */ -void nm_system_load_device_modules (void) -{ -} - - /* * nm_system_restart_mdns_responder *