emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vconfig: remove /proc/net/vlan/config check

Browse Source 
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 <paulius.zaleckas@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Paulius Zaleckas 2011-12-16 01:42:55 +01:00 committed by Denys Vlasenko
parent b05cd6b7a7
commit be2a557918
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
networking/vconfig.c
View File

@ -116,8 +116,6 @@ static const char name_types[] ALIGN1 = {
'_', 'N', 'O', '_', 'P', 'A', 'D', 0, '_', '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) MAIN_EXTERNALLY_VISIBLE;
int vconfig_main(int argc, char **argv) int vconfig_main(int argc, char **argv)
{ {
@ -129,10 +127,6 @@ int vconfig_main(int argc, char **argv)
bb_show_usage(); 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)); memset(&ifr, 0, sizeof(ifr));
++argv; ++argv;