aboutsummaryrefslogtreecommitdiffstats
path: root/package
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
commitb6d7e32d5074f08b95a4488989d5c43fd754bd65 (patch)
tree81ca80e6e24df7fd4e0fe990d901f77b21474582 /package
parentf3ebec46ad9d66d6279e2dff6b30751e4c61c6c7 (diff)
downloadmaster-187ad058-b6d7e32d5074f08b95a4488989d5c43fd754bd65.tar.gz
master-187ad058-b6d7e32d5074f08b95a4488989d5c43fd754bd65.tar.bz2
master-187ad058-b6d7e32d5074f08b95a4488989d5c43fd754bd65.zip
Fix the device names too long (#1591)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6987 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-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;
}
+