aboutsummaryrefslogtreecommitdiffstats
path: root/package/ppp/patches/205-pppoe_iface_name.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2007-04-17 16:45:49 +0000
committerFlorian Fainelli <florian@openwrt.org>2007-04-17 16:45:49 +0000
commit9f652a1a859efc0c2ea72e6c96c6cab40f4807cb (patch)
treed2fdba91a1d0895d48bfa87d8e9ec44a1c130864 /package/ppp/patches/205-pppoe_iface_name.patch
parent568a99403ff8593df7a5dbbe5c4da1a55fe4ddcc (diff)
downloadupstream-9f652a1a859efc0c2ea72e6c96c6cab40f4807cb.tar.gz
upstream-9f652a1a859efc0c2ea72e6c96c6cab40f4807cb.tar.bz2
upstream-9f652a1a859efc0c2ea72e6c96c6cab40f4807cb.zip
Fix the device names too long (#1591)
SVN-Revision: 6987
Diffstat (limited to 'package/ppp/patches/205-pppoe_iface_name.patch')
-rw-r--r--package/ppp/patches/205-pppoe_iface_name.patch18
1 files changed, 11 insertions, 7 deletions
diff --git a/package/ppp/patches/205-pppoe_iface_name.patch b/package/ppp/patches/205-pppoe_iface_name.patch
index 0961eca623..864866b0d7 100644
--- a/package/ppp/patches/205-pppoe_iface_name.patch
+++ b/package/ppp/patches/205-pppoe_iface_name.patch
@@ -1,12 +1,16 @@
-diff -ruN ppp-2.4.3-orig/pppd/plugins/rp-pppoe/plugin.c ppp-2.4.3-3/pppd/plugins/rp-pppoe/plugin.c
---- ppp-2.4.3-orig/pppd/plugins/rp-pppoe/plugin.c 2004-11-04 11:07:37.000000000 +0100
-+++ ppp-2.4.3-3/pppd/plugins/rp-pppoe/plugin.c 2004-12-16 01:07:22.000000000 +0100
-@@ -286,7 +286,7 @@
+diff -urN ppp-2.4.3/pppd/plugins/rp-pppoe/plugin.c ppp-2.4.3.new/pppd/plugins/rp-pppoe/plugin.c
+--- ppp-2.4.3/pppd/plugins/rp-pppoe/plugin.c 2004-11-04 11:07:37.000000000 +0100
++++ ppp-2.4.3.new/pppd/plugins/rp-pppoe/plugin.c 2007-04-17 18:38:12.000000000 +0200
+@@ -285,9 +285,9 @@
+ if (strlen(cmd) > 4 && !strncmp(cmd, "nic-", 4)) {
/* Strip off "nic-" */
cmd += 4;
- } else if (strlen(cmd) < 4
+- } else if (strlen(cmd) < 4
- || (strncmp(cmd, "eth", 3) && strncmp(cmd, "nas", 3)
-+ || (strncmp(cmd, "eth", 3) && strncmp(cmd, "nas", 3) && strncmp(cmd, "vlan", 4) && strncmp(cmd, "ath", 3)
- && strncmp(cmd, "tap", 3) && strncmp(cmd, "br", 2))) {
+- && strncmp(cmd, "tap", 3) && strncmp(cmd, "br", 2))) {
++ } else if (strlen(cmd) < 3
++ || (strncmp(cmd, "eth", 3) && strncmp(cmd, "nas", 3) && strncmp(cmd, "vlan", 4) && strncmp(cmd, "ath", 3)
++ && strncmp(cmd, "tap", 3) && strncmp(cmd, "br", 2))) {
return 0;
}
+