Rebase from upstream commit : 3bb9dcf44627ffdd313fe92c563ae454b6ff8aa6

[librecmc/librecmc.git] / package / network / services / ppp / patches / 206-compensate_time_change.patch

diff --git a/package/network/services/ppp/patches/206-compensate_time_change.patch b/package/network/services/ppp/patches/206-compensate_time_change.patch
index 31a582a202bdc635bb8bc59f176beac27532e0fb..bd259b97dc26716ec716cc9afd85a92832ccb3b8 100644 (file)
--- a/package/network/services/ppp/patches/206-compensate_time_change.patch
+++ b/package/network/services/ppp/patches/206-compensate_time_change.patch
@@ -29,7 +29,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
  static void setup_signals __P((void));
  static void create_pidfile __P((int pid));
  static void create_linkpidfile __P((int pid));
-@@ -535,6 +537,7 @@ main(argc, argv)
+@@ -527,6 +529,7 @@ main(argc, argv)
            info("Starting link");
        }
  
@@ -37,7 +37,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
        gettimeofday(&start_time, NULL);
        script_unsetenv("CONNECT_TIME");
        script_unsetenv("BYTES_SENT");
-@@ -1267,6 +1270,36 @@ struct  callout {
+@@ -1262,6 +1265,36 @@ struct  callout {
  
  static struct callout *callout = NULL;        /* Callout list */
  static struct timeval timenow;                /* Current time */
@@ -74,7 +74,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
  
  /*
   * timeout - Schedule a timeout.
-@@ -1337,6 +1370,8 @@ calltimeout()
+@@ -1332,6 +1365,8 @@ calltimeout()
  {
      struct callout *p;
  
@@ -83,7 +83,7 @@ Signed-off-by: Jo-Philipp Wich <jo@mein.io>
      while (callout != NULL) {
        p = callout;
  
-@@ -1364,6 +1399,8 @@ timeleft(tvp)
+@@ -1359,6 +1394,8 @@ timeleft(tvp)
  {
      if (callout == NULL)
        return NULL;