X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fplugins%2Fpppoe%2Fplugin.c;h=57324607d9e9acc7226a802b8d019544602c2f90;hb=a37b5cf877d2fe21370958d5a44e61c621c1adb7;hp=d7c5be1d9ee6f77f00968bd45d76b21e4ef2ac38;hpb=a352af45cf46af5de0c2b2377f0ca8e33776ad6c;p=ppp.git

diff --git a/pppd/plugins/pppoe/plugin.c b/pppd/plugins/pppoe/plugin.c
index d7c5be1..5732460 100644
--- a/pppd/plugins/pppoe/plugin.c
+++ b/pppd/plugins/pppoe/plugin.c
@@ -216,9 +216,14 @@ PPPOEConnectDevice(void)
 	    error("Failed to create PPPoE discovery socket: %m");
 	    goto errout;
 	}
-	discovery(conn);
+	discovery1(conn);
+	if (conn->discoveryState != STATE_RECEIVED_PADO) {
+	    error("Unable to complete PPPoE Discovery phase 1");
+	    goto errout;
+	}
+	discovery2(conn);
 	if (conn->discoveryState != STATE_SESSION) {
-	    error("Unable to complete PPPoE Discovery");
+	    error("Unable to complete PPPoE Discovery phase 2");
 	    goto errout;
 	}
     }