Index: head/contrib/ipfilter/lib/getifname.c
===================================================================
--- head/contrib/ipfilter/lib/getifname.c	(revision 366285)
+++ head/contrib/ipfilter/lib/getifname.c	(revision 366286)
@@ -1,81 +1,54 @@
 /*	$FreeBSD$	*/
 
 /*
  * Copyright (C) 2012 by Darren Reed.
  *
  * See the IPFILTER.LICENCE file for details on licencing.
  *
  * $Id$
  */
 
 #include "ipf.h"
 
 #include "kmem.h"
 
 /*
  * Given a pointer to an interface in the kernel, return a pointer to a
  * string which is the interface name.
  */
 char *getifname(ptr)
 	struct ifnet *ptr;
 {
-#if SOLARIS || defined(__hpux)
-# if SOLARIS
+#if SOLARIS
 #  include <sys/mutex.h>
 #  include <sys/condvar.h>
-# endif
 # include "../pfil/qif.h"
 	char *ifname;
 	qif_t qif;
 
 	if ((void *)ptr == (void *)-1)
 		return "!";
 	if (ptr == NULL)
 		return "-";
 
 	if (kmemcpy((char *)&qif, (u_long)ptr, sizeof(qif)) == -1)
 		return "X";
 	ifname = strdup(qif.qf_name);
 	if ((ifname != NULL) && (*ifname == '\0')) {
 		free(ifname);
 		return "!";
 	}
 	return ifname;
 #else
-# if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \
-    defined(__OpenBSD__) || \
-    (defined(__FreeBSD__) && (__FreeBSD_version >= 501113))
-#else
-	char buf[LIFNAMSIZ];
-	int len;
-# endif
 	struct ifnet netif;
 
 	if ((void *)ptr == (void *)-1)
 		return "!";
 	if (ptr == NULL)
 		return "-";
 
 	if (kmemcpy((char *)&netif, (u_long)ptr, sizeof(netif)) == -1)
 		return "X";
-# if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \
-    defined(__OpenBSD__) || defined(linux) || \
-    (defined(__FreeBSD__) && (__FreeBSD_version >= 501113))
 	return strdup(netif.if_xname);
-# else
-	if (kstrncpy(buf, (u_long)netif.if_name, sizeof(buf)) == -1)
-		return "X";
-	if (netif.if_unit < 10)
-		len = 2;
-	else if (netif.if_unit < 1000)
-		len = 3;
-	else if (netif.if_unit < 10000)
-		len = 4;
-	else
-		len = 5;
-	buf[sizeof(buf) - len] = '\0';
-	sprintf(buf + strlen(buf), "%d", netif.if_unit % 10000);
-	return strdup(buf);
-# endif
 #endif
 }