X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fplugins%2Frp-pppoe%2Fplugin.c;fp=pppd%2Fplugins%2Frp-pppoe%2Fplugin.c;h=3fa669c0d315a34a3e3702d9b43154c9a800b2eb;hb=e9925858258e464095e7ee9d21a1facf789e9b38;hp=00316ae5050979482e2c8f2925ec8d354f0c2f63;hpb=e672f7597fd88d86acdaf504baedd19e68e6de65;p=ppp.git

diff --git a/pppd/plugins/rp-pppoe/plugin.c b/pppd/plugins/rp-pppoe/plugin.c
index 00316ae..3fa669c 100644
--- a/pppd/plugins/rp-pppoe/plugin.c
+++ b/pppd/plugins/rp-pppoe/plugin.c
@@ -22,7 +22,7 @@
 ***********************************************************************/
 
 static char const RCSID[] =
-"$Id: plugin.c,v 1.10 2004/01/13 04:03:58 paulus Exp $";
+"$Id: plugin.c,v 1.11 2004/10/24 23:06:31 paulus Exp $";
 
 #define _GNU_SOURCE 1
 #include "pppoe.h"
@@ -80,7 +80,7 @@ static option_t Options[] = {
       "Be verbose about discovered access concentrators"},
     { NULL }
 };
-int (*OldDevnameHook)(char *cmd, char **argv, int doit) = NULL;
+
 static PPPoEConnection *conn = NULL;
 
 /**********************************************************************
@@ -283,9 +283,9 @@ PPPoEDevnameHook(char *cmd, char **argv, int doit)
     if (strlen(cmd) > 4 && !strncmp(cmd, "nic-", 4)) {
 	/* Strip off "nic-" */
 	cmd += 4;
-    } else if (strlen(cmd) < 4 || (strncmp(cmd, "eth", 3) &&
-		strncmp(cmd, "nas", 3) && strncmp(cmd, "tap", 3))) {
-	if (OldDevnameHook) return OldDevnameHook(cmd, argv, doit);
+    } else if (strlen(cmd) < 4
+	       || (strncmp(cmd, "eth", 3) && strncmp(cmd, "nas", 3)
+		   && strncmp(cmd, "tap", 3) && strncmp(cmd, "br", 2))) {
 	return 0;
     }
 
@@ -343,7 +343,6 @@ PPPoEDevnameHook(char *cmd, char **argv, int doit)
 	return 1;
     }
 
-    if (OldDevnameHook) r = OldDevnameHook(cmd, argv, doit);
     return r;
 }