From: Florian Fainelli <florian@openwrt.org>
Date: Tue, 17 Apr 2007 16:45:49 +0000 (+0000)
Subject: Fix the device names too long (#1591)
X-Git-Tag: reboot~29415
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9f652a1a859efc0c2ea72e6c96c6cab40f4807cb;p=openwrt%2Fstaging%2Fxback.git

Fix the device names too long (#1591)

SVN-Revision: 6987
---

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;
      }
+