ath9k: fix a few crash issues on hardware reset

[openwrt.git] / package / ppp / patches / 206-compensate_time_change.patch

diff --git a/package/ppp/patches/206-compensate_time_change.patch b/package/ppp/patches/206-compensate_time_change.patch
index f842ff2..4ec488f 100644 (file)
--- a/package/ppp/patches/206-compensate_time_change.patch
+++ b/package/ppp/patches/206-compensate_time_change.patch
@@ -8,7 +8,7 @@
  
  #include "pppd.h"
  #include "magic.h"
  
  #include "pppd.h"
  #include "magic.h"

-@@ -227,6 +228,7 @@ static struct subprocess *children;
+@@ -228,6 +229,7 @@ static struct subprocess *children;

  
  /* Prototypes for procedures local to this file. */
  
  
  /* Prototypes for procedures local to this file. */
  


@@ -16,7 +16,7 @@
  static void setup_signals __P((void));
  static void create_pidfile __P((int pid));
  static void create_linkpidfile __P((int pid));
  static void setup_signals __P((void));
  static void create_pidfile __P((int pid));
  static void create_linkpidfile __P((int pid));

-@@ -532,6 +534,7 @@ main(argc, argv)
+@@ -533,6 +535,7 @@ main(argc, argv)

            info("Starting link");
        }
  
            info("Starting link");
        }
  


@@ -24,7 +24,7 @@
        gettimeofday(&start_time, NULL);
        script_unsetenv("CONNECT_TIME");
        script_unsetenv("BYTES_SENT");
        gettimeofday(&start_time, NULL);
        script_unsetenv("CONNECT_TIME");
        script_unsetenv("BYTES_SENT");

-@@ -1264,6 +1267,36 @@ struct  callout {
+@@ -1265,6 +1268,36 @@ struct  callout {

  
  static struct callout *callout = NULL;        /* Callout list */
  static struct timeval timenow;                /* Current time */
  
  static struct callout *callout = NULL;        /* Callout list */
  static struct timeval timenow;                /* Current time */


@@ -61,7 +61,7 @@
  
  /*
   * timeout - Schedule a timeout.
  
  /*
   * timeout - Schedule a timeout.

-@@ -1334,6 +1367,8 @@ calltimeout()
+@@ -1335,6 +1368,8 @@ calltimeout()

  {
      struct callout *p;
  
  {
      struct callout *p;
  


@@ -70,7 +70,7 @@
      while (callout != NULL) {
        p = callout;
  
      while (callout != NULL) {
        p = callout;
  

-@@ -1361,6 +1396,8 @@ timeleft(tvp)
+@@ -1362,6 +1397,8 @@ timeleft(tvp)

  {
      if (callout == NULL)
        return NULL;
  {
      if (callout == NULL)
        return NULL;