X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/a9b9eacace42cffb4cc10a5b61c5633b94730999..502d6255c81bbbfa76c6fc153d2c57351ee85d32:/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 16d90c4d7..26e683753 100644
--- 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
-@@ -742,8 +742,11 @@ void
+@@ -745,8 +745,11 @@ void
  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 */
-@@ -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 },
@@ -47,7 +47,7 @@
  /*
   * 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 */
@@ -78,7 +78,7 @@
  
  	if (ppp_dev_fd >= 0) {
  		dbglog("in make_ppp_unit, already had /dev/ppp open?");
-@@ -645,6 +650,32 @@ static int make_ppp_unit()
+@@ -645,6 +650,30 @@ static int make_ppp_unit()
  	}
  	if (x < 0)
  		error("Couldn't create new ppp unit: %m");
@@ -103,8 +103,6 @@
 +			error("Couldn't rename %s to %s", ifr.ifr_name, ifr.ifr_newname);
 +			close(ppp_dev_fd);
 +			ppp_dev_fd = -1;
-+		} else {
-+			info("Renamed %s to %s", ifr.ifr_name, ifr.ifr_newname);
 +		}
 +	}
 +
@@ -117,12 +115,12 @@
      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);
      }
-+*/
++#endif
  
  #ifndef STREAMS
      {