ppp: update to version 2.4.7.git-2018-06-23

[openwrt/staging/hauke.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 bba5884fa4683ee5cf85e198e8b7194165ab2460..88a991fd80b2cd6bc0cdad1b948102aba8752d82 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
@@ -8,7 +8,15 @@ Signed-off-by: George Kashperko <george@znau.edu.ua>
  2 files changed, 53 insertions(+), 14 deletions(-)
 --- a/pppd/multilink.c
 +++ b/pppd/multilink.c
-@@ -56,7 +56,8 @@ static void iterate_bundle_links __P((vo
+@@ -35,6 +35,7 @@
+ #include <signal.h>
+ #include <netinet/in.h>
+ #include <unistd.h>
++#include <net/if.h>
+ 
+ #include "pppd.h"
+ #include "fsm.h"
+@@ -56,7 +57,8 @@ static void iterate_bundle_links __P((vo
  
  static int get_default_epdisc __P((struct epdisc *));
  static int parse_num __P((char *str, const char *key, int *valp));
@@ -18,7 +26,7 @@ Signed-off-by: George Kashperko <george@znau.edu.ua>
  
  #define set_ip_epdisc(ep, addr) do {  \
        ep->length = 4;                 \
-@@ -197,35 +198,38 @@ mp_join_bundle()
+@@ -197,35 +199,38 @@ mp_join_bundle()
        key.dptr = bundle_id;
        key.dsize = p - bundle_id;
        pid = tdb_fetch(pppdb, key);
@@ -65,7 +73,7 @@ Signed-off-by: George Kashperko <george@znau.edu.ua>
        }
  
        /* we have to make a new bundle */
-@@ -408,22 +412,45 @@ parse_num(str, key, valp)
+@@ -408,22 +413,45 @@ parse_num(str, key, valp)
        return 0;
  }
  
@@ -118,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
-@@ -698,6 +698,16 @@ void cfg_bundle(int mrru, int mtru, int
+@@ -686,6 +686,16 @@ void cfg_bundle(int mrru, int mtru, int
        add_fd(ppp_dev_fd);
  }
  
@@ -135,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
-@@ -716,6 +726,8 @@ void make_new_bundle(int mrru, int mtru,
+@@ -704,6 +714,8 @@ void make_new_bundle(int mrru, int mtru,
  
        /* set the mrru and flags */
        cfg_bundle(mrru, mtru, rssn, tssn);