From: tb <tb@openbsd.org>
Date: Tue, 20 Feb 2018 15:33:16 +0000 (+0000)
Subject: Move getvnetflowid() out of #ifndef SMALL to unbreak 'make release'.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=8a6ea6f378671a3f7c5d5ebef0e0003afbdb66ed;p=openbsd

Move getvnetflowid() out of #ifndef SMALL to unbreak 'make release'.

Diff from jsg, ok millert, benno
---

diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index a1a8b787b43..a91173b08a5 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ifconfig.c,v 1.359 2018/02/20 03:45:06 dlg Exp $	*/
+/*	$OpenBSD: ifconfig.c,v 1.360 2018/02/20 15:33:16 tb Exp $	*/
 /*	$NetBSD: ifconfig.c,v 1.40 1997/10/01 02:19:43 enami Exp $	*/
 
 /*
@@ -3357,20 +3357,6 @@ delvnetflowid(const char *ignored, int alsoignored)
 		warn("SIOCSVNETFLOWID");
 }
 
-void
-getvnetflowid(struct ifencap *ife)
-{
-	if (strlcpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)) >=
-	    sizeof(ifr.ifr_name))
-		errx(1, "vnetflowid: name is too long");
-
-	if (ioctl(s, SIOCGVNETFLOWID, &ifr) == -1)
-		return;
-
-	if (ifr.ifr_vnetid)
-		ife->ife_flags |= IFE_VNETFLOWID;
-}
-
 void
 mpe_status(void)
 {
@@ -3557,6 +3543,20 @@ setmpwcontrolword(const char *value, int d)
 }
 #endif /* SMALL */
 
+void
+getvnetflowid(struct ifencap *ife)
+{
+	if (strlcpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)) >=
+	    sizeof(ifr.ifr_name))
+		errx(1, "vnetflowid: name is too long");
+
+	if (ioctl(s, SIOCGVNETFLOWID, &ifr) == -1)
+		return;
+
+	if (ifr.ifr_vnetid)
+		ife->ife_flags |= IFE_VNETFLOWID;
+}
+
 void
 setvnetid(const char *id, int param)
 {