From be2a557918af86cc55b3426f97664503fe7e265f Mon Sep 17 00:00:00 2001 From: Paulius Zaleckas Date: Fri, 16 Dec 2011 01:42:55 +0100 Subject: [PATCH] vconfig: remove /proc/net/vlan/config check In original implementation /proc/net/vlan/config check only prints warning and does not exit. Busybox version exits if this file is not found and this prevents kernel module autoloading to work. I think it is safe to remove this check since ioctl() call will fail (with proper error code) anyway if 802.1q module is not loaded (or autoloading is off). Signed-off-by: Paulius Zaleckas Signed-off-by: Denys Vlasenko --- networking/vconfig.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/networking/vconfig.c b/networking/vconfig.c index 48b45d9af..ac8b96d8c 100644 --- a/networking/vconfig.c +++ b/networking/vconfig.c @@ -116,8 +116,6 @@ static const char name_types[] ALIGN1 = { '_', 'N', 'O', '_', 'P', 'A', 'D', 0, }; -static const char conf_file_name[] ALIGN1 = "/proc/net/vlan/config"; - int vconfig_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int vconfig_main(int argc, char **argv) { @@ -129,10 +127,6 @@ int vconfig_main(int argc, char **argv) bb_show_usage(); } - /* Don't bother closing the filedes. It will be closed on cleanup. */ - /* Will die if 802.1q is not present */ - xopen(conf_file_name, O_RDONLY); - memset(&ifr, 0, sizeof(ifr)); ++argv;