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 <[email protected]>
diff -upr busybox-1.19.3.orig/networking/vconfig.c busybox-1.19.3/networking/vconfig.c
--- busybox-1.19.3.orig/networking/vconfig.c 2011-12-15 17:26:54.563878947 +0200
+++ busybox-1.19.3/networking/vconfig.c 2011-12-15 17:28:20.627082893 +0200
@@ -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;
_______________________________________________
busybox mailing list
[email protected]
http://lists.busybox.net/mailman/listinfo/busybox
