Fix the device names too long (#1591)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6987 3c298f89-4303-0410-b956-a3cf2f4a3e73master
parent
f3ebec46ad
commit
b6d7e32d50
|
@ -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
|
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-orig/pppd/plugins/rp-pppoe/plugin.c 2004-11-04 11:07:37.000000000 +0100
|
--- ppp-2.4.3/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
|
+++ ppp-2.4.3.new/pppd/plugins/rp-pppoe/plugin.c 2007-04-17 18:38:12.000000000 +0200
|
||||||
@@ -286,7 +286,7 @@
|
@@ -285,9 +285,9 @@
|
||||||
|
if (strlen(cmd) > 4 && !strncmp(cmd, "nic-", 4)) {
|
||||||
/* Strip off "nic-" */
|
/* Strip off "nic-" */
|
||||||
cmd += 4;
|
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, "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;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue