From: Roy Marples <roy@marples.name>
Date: Wed, 18 Sep 2019 12:59:03 +0000 (+0100)
Subject: dhcpcd: Check carrier directly after a route socket overflow
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a059999ad58d92aa28855ef156e06bf4a247c3e4;p=thirdparty%2Fdhcpcd.git

dhcpcd: Check carrier directly after a route socket overflow

Check carrier directly rather than using LINK_UNKNOWN as that
will be forced down for wireless cards.
---

diff --git a/src/dhcpcd.c b/src/dhcpcd.c
index f944d9e6..e9b8a023 100644
--- a/src/dhcpcd.c
+++ b/src/dhcpcd.c
@@ -1094,8 +1094,13 @@ static void
 dhcpcd_checkcarrier(void *arg)
 {
 	struct interface *ifp = arg;
+	int carrier;
 
-	dhcpcd_handlecarrier(ifp->ctx, LINK_UNKNOWN, ifp->flags, ifp->name);
+	/* Check carrier here rather than setting LINK_UNKNOWN.
+	 * This is because we force LINK_UNKNOWN as down for wireless which
+	 * we do not want when dealing with a route socket overflow. */
+	carrier = if_carrier(ifp);
+	dhcpcd_handlecarrier(ifp->ctx, carrier, ifp->flags, ifp->name);
 }
 
 #ifndef SMALL