From: Paul Mackerras <paulus@samba.org>
Date: Fri, 14 Aug 2015 10:31:15 +0000 (+1000)
Subject: Merge branch 'no-error-on-already-closed' of git://github.com/farnz/ppp
X-Git-Tag: ppp-2.4.8~47
X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=commitdiff_plain;h=6edf252483b30dbcdcc5059f01831455365d5b6e;hp=aa4a985f6114d08cf4e47634fb6325da71016473

Merge branch 'no-error-on-already-closed' of git://github.com/farnz/ppp

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

diff --git a/pppd/plugins/rp-pppoe/plugin.c b/pppd/plugins/rp-pppoe/plugin.c
index a8c2bb4..da50cdf 100644
--- a/pppd/plugins/rp-pppoe/plugin.c
+++ b/pppd/plugins/rp-pppoe/plugin.c
@@ -270,7 +270,7 @@ 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?? */