From: Roy Marples <roy@marples.name>
Date: Wed, 23 Sep 2020 08:26:16 +0000 (+0100)
Subject: FreeBSD lacks SIOCGIFDATA it seems.
X-Git-Tag: v9.3.0~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e3a64fdfe385894aa12d95cc09c174393350630;p=thirdparty%2Fdhcpcd.git

FreeBSD lacks SIOCGIFDATA it seems.
---

diff --git a/src/if-bsd.c b/src/if-bsd.c
index c7be22fe..7f8cc6f6 100644
--- a/src/if-bsd.c
+++ b/src/if-bsd.c
@@ -382,12 +382,16 @@ int
 if_carrier(struct interface *ifp)
 {
 	int carrier = if_carrier0(ifp);
+#ifdef SIOCGIFDATA
 	struct ifdatareq ifdr = { .ifdr_data.ifi_link_state = 0 };
 	struct if_data *ifdata;
 
 	if (carrier != LINK_UNKNOWN)
 		return carrier;
 
+	struct ifdatareq ifdr = { .ifdr_data.ifi_link_state = 0 };
+	struct if_data *ifdata;
+
 	strlcpy(ifdr.ifdr_name, ifp->name, sizeof(ifdr.ifdr_name));
 	if (ioctl(ifp->ctx->pf_inet_fd, SIOCGIFDATA, &ifdr) == -1)
 		return LINK_UNKNOWN;
@@ -400,6 +404,9 @@ if_carrier(struct interface *ifp)
 		return LINK_UP;
 	}
 	return LINK_UNKNOWN;
+#else
+	return carrier;
+#endif
 }
 
 int