aboutsummaryrefslogtreecommitdiffstats
path: root/package/busybox
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-12-23 10:59:57 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-12-23 10:59:57 +0000
commita1e2b2ebe859b817e412438a6f6bccc3afccaba7 (patch)
tree5cff129f31ccd3897eb4713b7d945279d0c0cff9 /package/busybox
parentde707ac97e694f87c6df90eb7e1b21e63a59ba0f (diff)
downloadupstream-a1e2b2ebe859b817e412438a6f6bccc3afccaba7.tar.gz
upstream-a1e2b2ebe859b817e412438a6f6bccc3afccaba7.tar.bz2
upstream-a1e2b2ebe859b817e412438a6f6bccc3afccaba7.zip
busybox: (vconfig) do not attempt to open /proc/net/vlan/config for no good reason (fixes #12663)
SVN-Revision: 34872
Diffstat (limited to 'package/busybox')
-rw-r--r--package/busybox/patches/260-vconfig_proc.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/package/busybox/patches/260-vconfig_proc.patch b/package/busybox/patches/260-vconfig_proc.patch
new file mode 100644
index 0000000000..5d6c26b983
--- /dev/null
+++ b/package/busybox/patches/260-vconfig_proc.patch
@@ -0,0 +1,22 @@
+--- 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;