diff options
author | Paulius Zaleckas <paulius.zaleckas@gmail.com> | 2011-12-16 01:42:55 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2011-12-16 01:42:55 +0100 |
commit | be2a557918af86cc55b3426f97664503fe7e265f (patch) | |
tree | 63a5e2f7cf111d40d4b14392df2614d607c6e9f4 | |
parent | b05cd6b7a768039fa799f62634bdc83cb5803ed7 (diff) | |
download | busybox-w32-be2a557918af86cc55b3426f97664503fe7e265f.tar.gz busybox-w32-be2a557918af86cc55b3426f97664503fe7e265f.tar.bz2 busybox-w32-be2a557918af86cc55b3426f97664503fe7e265f.zip |
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 <paulius.zaleckas@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | networking/vconfig.c | 6 |
1 files changed, 0 insertions, 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 = { | |||
116 | '_', 'N', 'O', '_', 'P', 'A', 'D', 0, | 116 | '_', 'N', 'O', '_', 'P', 'A', 'D', 0, |
117 | }; | 117 | }; |
118 | 118 | ||
119 | static const char conf_file_name[] ALIGN1 = "/proc/net/vlan/config"; | ||
120 | |||
121 | int vconfig_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | 119 | int vconfig_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; |
122 | int vconfig_main(int argc, char **argv) | 120 | int vconfig_main(int argc, char **argv) |
123 | { | 121 | { |
@@ -129,10 +127,6 @@ int vconfig_main(int argc, char **argv) | |||
129 | bb_show_usage(); | 127 | bb_show_usage(); |
130 | } | 128 | } |
131 | 129 | ||
132 | /* Don't bother closing the filedes. It will be closed on cleanup. */ | ||
133 | /* Will die if 802.1q is not present */ | ||
134 | xopen(conf_file_name, O_RDONLY); | ||
135 | |||
136 | memset(&ifr, 0, sizeof(ifr)); | 130 | memset(&ifr, 0, sizeof(ifr)); |
137 | 131 | ||
138 | ++argv; | 132 | ++argv; |