kernel: update linux 3.2 to 3.2.12

[openwrt.git] / package / ppp / patches / 320-custom_iface_names.patch

diff --git a/package/ppp/patches/320-custom_iface_names.patch b/package/ppp/patches/320-custom_iface_names.patch
index ff9ef86..26e6837 100644 (file)
--- a/package/ppp/patches/320-custom_iface_names.patch
+++ b/package/ppp/patches/320-custom_iface_names.patch
@@ -1,6 +1,6 @@
 --- a/pppd/main.c
 +++ b/pppd/main.c
 --- a/pppd/main.c
 +++ b/pppd/main.c

-@@ -742,8 +742,11 @@ void
+@@ -745,8 +745,11 @@ void

  set_ifunit(iskey)
      int iskey;
  {
  set_ifunit(iskey)
      int iskey;
  {


@@ -24,7 +24,7 @@
  bool  tune_kernel;            /* may alter kernel settings */
  int   connect_delay = 1000;   /* wait this many ms after connect script */
  int   req_unit = -1;          /* requested interface unit */
  bool  tune_kernel;            /* may alter kernel settings */
  int   connect_delay = 1000;   /* wait this many ms after connect script */
  int   req_unit = -1;          /* requested interface unit */

-@@ -264,6 +265,9 @@ option_t general_options[] = {
+@@ -266,6 +267,9 @@ option_t general_options[] = {

      { "linkname", o_string, linkname,
        "Set logical name for link",
        OPT_PRIO | OPT_PRIV | OPT_STATIC, NULL, MAXPATHLEN },
      { "linkname", o_string, linkname,
        "Set logical name for link",
        OPT_PRIO | OPT_PRIV | OPT_STATIC, NULL, MAXPATHLEN },


@@ -47,7 +47,7 @@
  /*
   * Limits.
   */
  /*
   * Limits.
   */

-@@ -308,6 +312,7 @@ extern char        *record_file;   /* File to rec
+@@ -309,6 +313,7 @@ extern char        *record_file;   /* File to rec

  extern bool   sync_serial;    /* Device is synchronous serial device */
  extern int    maxfail;        /* Max # of unsuccessful connection attempts */
  extern char   linkname[MAXPATHLEN]; /* logical name for link */
  extern bool   sync_serial;    /* Device is synchronous serial device */
  extern int    maxfail;        /* Max # of unsuccessful connection attempts */
  extern char   linkname[MAXPATHLEN]; /* logical name for link */


@@ -115,12 +115,12 @@
      if (argc > 0)
        interface = argv[0];
  
      if (argc > 0)
        interface = argv[0];
  

-+/*
++#if 0

      if (sscanf(interface, PPP_DRV_NAME "%d", &unit) != 1) {
        fprintf(stderr, "%s: invalid interface '%s' specified\n",
                progname, interface);
      }
      if (sscanf(interface, PPP_DRV_NAME "%d", &unit) != 1) {
        fprintf(stderr, "%s: invalid interface '%s' specified\n",
                progname, interface);
      }

-+*/
++#endif

  
  #ifndef STREAMS
      {
  
  #ifndef STREAMS
      {