Merge branch 'send-padt-on-disconnect' of git://github.com/farnz/ppp

Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --cc pppd/plugins/rp-pppoe/plugin.c
index da50cdf2b9d3956a90a61e9209a2249a7ca61faa,90fb8089ad8f69590fe196cd9e9f49787809e574..c89be94250bc660203beb0a163776fddbb5d074b
--- 1/pppd/plugins/rp-pppoe/plugin.c
--- 2/pppd/plugins/rp-pppoe/plugin.c
+++ b/pppd/plugins/rp-pppoe/plugin.c
@@@ -270,12 -270,13 +270,13 @@@ PPPOEDisconnectDevice(void
      memcpy(sp.sa_addr.pppoe.dev, conn->ifName, IFNAMSIZ);
      memcpy(sp.sa_addr.pppoe.remote, conn->peerEth, ETH_ALEN);
      if (connect(conn->sessionSocket, (struct sockaddr *) &sp,
 -              sizeof(struct sockaddr_pppox)) < 0)
 +              sizeof(struct sockaddr_pppox)) < 0 && errno != EALREADY)
        error("Failed to disconnect PPPoE socket: %d %m", errno);
      close(conn->sessionSocket);
-     /* don't send PADT?? */
-     if (conn->discoverySocket >= 0)
+     if (conn->discoverySocket >= 0) {
+         sendPADT(conn, NULL);
        close(conn->discoverySocket);
+     }
  }
  
  static void