From e291c587e0b4010dcdcdbe7a73b2727b7feba333 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 15 Apr 2015 10:47:34 +0200
Subject: [PATCH] Revert "tools: apply pfaltq_interface_bw.diff"

This reverts commit ef2852df3249529a76e250469e21968b90fe87e6.
Bubble up the error into core.git, so that we can fix it in
a FreeBSD compliant way.

Suggested by: ad@
---
 sbin/pfctl/pfctl_altq.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/sbin/pfctl/pfctl_altq.c b/sbin/pfctl/pfctl_altq.c
index 514588f646d..3abd2788d94 100644
--- a/sbin/pfctl/pfctl_altq.c
+++ b/sbin/pfctl/pfctl_altq.c
@@ -33,7 +33,6 @@ __FBSDID("$FreeBSD$");
 #include <errno.h>
 #include <limits.h>
 #include <math.h>
-#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -265,11 +264,15 @@ eval_pfaltq(struct pfctl *pf, struct pf_altq *pa, struct node_queue_bw *bw,
 		pa->ifbandwidth = bw->bw_absolute;
 	else
 #ifdef __FreeBSD__
-		rate = getifspeed(pf->dev, pa->ifname); 
-		if (rate == 0)
-			rate = IF_Mbps(100);
+		if ((rate = getifspeed(pf->dev, pa->ifname)) == 0) {
+#else
+		if ((rate = getifspeed(pa->ifname)) == 0) {
 #endif
-		if ((pa->ifbandwidth = eval_bwspec(bw, rate)) == 0)
+			fprintf(stderr, "interface %s does not know its bandwidth, "
+			    "please specify an absolute bandwidth\n",
+			    pa->ifname);
+			errors++;
+		} else if ((pa->ifbandwidth = eval_bwspec(bw, rate)) == 0)
 			pa->ifbandwidth = rate;
 
 	errors += eval_queue_opts(pa, opts, pa->ifbandwidth);