mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-03 00:25:03 +02:00
79c8117684
Bump to the current version of PPP. A few of the patches are either in 2.4.5 or something functionally equivalent is, so those patches were removed. 1 patch was added to accommodate pppol2pv3_addr which is referenced in a linux kernel header file, but isn't defined in the kernel header files packaged with PPP. Redux: re-instate the commenting out of the exponential back-off as requested by Felix. Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27818 3c298f89-4303-0410-b956-a3cf2f4a3e73
33 lines
1006 B
Diff
33 lines
1006 B
Diff
--- a/pppd/plugins/pppoatm/pppoatm.c
|
|
+++ b/pppd/plugins/pppoatm/pppoatm.c
|
|
@@ -75,13 +75,14 @@ static int setdevname_pppoatm(const char
|
|
//info("PPPoATM setdevname_pppoatm: '%s'", cp);
|
|
memset(&addr, 0, sizeof addr);
|
|
if (text2atm(cp, (struct sockaddr *) &addr, sizeof(addr),
|
|
- T2A_PVC | T2A_NAME) < 0) {
|
|
- if(doit)
|
|
- info("atm does not recognize: %s", cp);
|
|
+ T2A_PVC | T2A_NAME | T2A_WILDCARD) < 0) {
|
|
+ if (doit)
|
|
+ info("cannot parse the ATM address: %s", cp);
|
|
return 0;
|
|
- }
|
|
- if (!doit) return 1;
|
|
- //if (!dev_set_ok()) return -1;
|
|
+ }
|
|
+ if (!doit)
|
|
+ return 1;
|
|
+
|
|
memcpy(&pvcaddr, &addr, sizeof pvcaddr);
|
|
strlcpy(devnam, cp, sizeof devnam);
|
|
devstat.st_mode = S_IFSOCK;
|
|
@@ -170,7 +171,7 @@ static void disconnect_pppoatm(void)
|
|
|
|
void plugin_init(void)
|
|
{
|
|
-#if defined(__linux__)
|
|
+#ifdef linux
|
|
extern int new_style_driver; /* From sys-linux.c */
|
|
if (!ppp_available() && !new_style_driver)
|
|
fatal("Kernel doesn't support ppp_generic - "
|