pppd: update to 2.4.8

[openwrt/staging/chunkeey.git] / package / network / services / ppp / patches / 321-multilink_support_custom_iface_names.patch

diff --git a/package/network/services/ppp/patches/321-multilink_support_custom_iface_names.patch b/package/network/services/ppp/patches/321-multilink_support_custom_iface_names.patch
index b028df4844b61cec62d12f8025a5095396d4ce01..75c803650fa06c1f1d78fe2272d560998e1df1f0 100644 (file)
--- a/package/network/services/ppp/patches/321-multilink_support_custom_iface_names.patch
+++ b/package/network/services/ppp/patches/321-multilink_support_custom_iface_names.patch
@@ -41,7 +41,7 @@ Signed-off-by: George Kashperko <george@znau.edu.ua>
                        /* make sure the string is null-terminated */
                        rec.dptr[rec.dsize-1] = 0;
 -                      /* parse the interface number */
--                      parse_num(rec.dptr, "IFNAME=ppp", &unit);
+-                      parse_num(rec.dptr, "UNIT=", &unit);
 +
                        /* check the pid value */
                        if (!parse_num(rec.dptr, "PPPD_PID=", &pppd_pid)
@@ -114,7 +114,7 @@ Signed-off-by: George Kashperko <george@znau.edu.ua>
        TDB_DATA kd, vd;
        int ret = 0;
  
--      slprintf(ifkey, sizeof(ifkey), "IFNAME=ppp%d", unit);
+-      slprintf(ifkey, sizeof(ifkey), "UNIT=%d", unit);
 +      slprintf(ifkey, sizeof(ifkey), "IFNAME=%s", ifname);
 +
        kd.dptr = ifkey;
@@ -126,7 +126,7 @@ Signed-off-by: George Kashperko <george@znau.edu.ua>
                        && memcmp(vd.dptr, key.dptr, vd.dsize) == 0;
 --- a/pppd/sys-linux.c
 +++ b/pppd/sys-linux.c
-@@ -693,6 +693,16 @@ void cfg_bundle(int mrru, int mtru, int
+@@ -700,6 +700,16 @@ void cfg_bundle(int mrru, int mtru, int
        add_fd(ppp_dev_fd);
  }
  
@@ -143,7 +143,7 @@ Signed-off-by: George Kashperko <george@znau.edu.ua>
  /*
   * make_new_bundle - create a new PPP unit (i.e. a bundle)
   * and connect our channel to it.  This should only get called
-@@ -711,6 +721,8 @@ void make_new_bundle(int mrru, int mtru,
+@@ -718,6 +728,8 @@ void make_new_bundle(int mrru, int mtru,
  
        /* set the mrru and flags */
        cfg_bundle(mrru, mtru, rssn, tssn);