diff options
| author | Luiz Otavio O Souza <luiz@netgate.com> | 2016-02-17 08:48:27 -0600 |
|---|---|---|
| committer | Luiz Otavio O Souza <luiz@netgate.com> | 2016-02-17 08:48:27 -0600 |
| commit | 2173222607e49c977882ec0ec9f31cd806153104 (patch) | |
| tree | 625d5c955847b1afa042ece6358ff451ea6ca287 | |
| parent | 3ab4ff9ef32c1a813dcdd9ac3081028291a9c924 (diff) | |
| download | FreeBSD-src-2173222607e49c977882ec0ec9f31cd806153104.zip FreeBSD-src-2173222607e49c977882ec0ec9f31cd806153104.tar.gz | |
Revert "Importing pfSense patch pfaltq_interface_bw.diff"
This reverts commit ac3e7b54ba0ac476ce2082bb17af347660f1f46a.
| -rw-r--r-- | sbin/pfctl/pfctl_altq.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sbin/pfctl/pfctl_altq.c b/sbin/pfctl/pfctl_altq.c index 8656113..94dca9f 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); |
