d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove some write-only variables.

Browse Source 
There is another block of code that is now useless as the computation
is done in the kernel.
This commit is contained in:
Luigi Rizzo 2012-03-01 17:35:16 +00:00
parent 699f40077b
commit fa8d2a59bc
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=232347
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sbin/ipfw/dummynet.c
View File

@ -761,7 +761,6 @@ ipfw_config_pipe(int ac, char **av)
{ {
int i, j; int i, j;
char *end; char *end;
void *par = NULL;
struct dn_id *buf, *base; struct dn_id *buf, *base;
struct dn_sch *sch = NULL; struct dn_sch *sch = NULL;
struct dn_link *p = NULL; struct dn_link *p = NULL;
@ -905,7 +904,6 @@ ipfw_config_pipe(int ac, char **av)
* per-flow queue, mask is dst_ip, dst_port, * per-flow queue, mask is dst_ip, dst_port,
* src_ip, src_port, proto measured in bits * src_ip, src_port, proto measured in bits
*/ */
par = NULL;
bzero(mask, sizeof(*mask)); bzero(mask, sizeof(*mask));
end = NULL; end = NULL;
@ -1179,7 +1177,6 @@ ipfw_config_pipe(int ac, char **av)
if (fs->flags & DN_IS_RED) { if (fs->flags & DN_IS_RED) {
size_t len; size_t len;
int lookup_depth, avg_pkt_size; int lookup_depth, avg_pkt_size;
double w_q;
if (fs->min_th >= fs->max_th) if (fs->min_th >= fs->max_th)
errx(EX_DATAERR, "min_th %d must be < than max_th %d", errx(EX_DATAERR, "min_th %d must be < than max_th %d",
@ -1205,6 +1202,7 @@ ipfw_config_pipe(int ac, char **av)
"net.inet.ip.dummynet.red_avg_pkt_size must" "net.inet.ip.dummynet.red_avg_pkt_size must"
" be greater than zero"); " be greater than zero");
#if 0 /* the following computation is now done in the kernel */
/* /*
* Ticks needed for sending a medium-sized packet. * Ticks needed for sending a medium-sized packet.
* Unfortunately, when we are configuring a WF2Q+ queue, we * Unfortunately, when we are configuring a WF2Q+ queue, we
@ -1214,19 +1212,16 @@ ipfw_config_pipe(int ac, char **av)
* correct. But on the other hand, why do we want RED with * correct. But on the other hand, why do we want RED with
* WF2Q+ ? * WF2Q+ ?
*/ */
#if 0
if (p.bandwidth==0) /* this is a WF2Q+ queue */ if (p.bandwidth==0) /* this is a WF2Q+ queue */
s = 0; s = 0;
else else
s = (double)ck.hz * avg_pkt_size * 8 / p.bandwidth; s = (double)ck.hz * avg_pkt_size * 8 / p.bandwidth;
#endif
/* /*
* max idle time (in ticks) before avg queue size becomes 0. * max idle time (in ticks) before avg queue size becomes 0.
* NOTA: (3/w_q) is approx the value x so that * NOTA: (3/w_q) is approx the value x so that
* (1-w_q)^x < 10^-3. * (1-w_q)^x < 10^-3.
*/ */
w_q = ((double)fs->w_q) / (1 << SCALE_RED); w_q = ((double)fs->w_q) / (1 << SCALE_RED);
#if 0 // go in kernel
idle = s * 3. / w_q; idle = s * 3. / w_q;
fs->lookup_step = (int)idle / lookup_depth; fs->lookup_step = (int)idle / lookup_depth;
if (!fs->lookup_step) if (!fs->lookup_step)
@ -1235,7 +1230,7 @@ ipfw_config_pipe(int ac, char **av)
for (t = fs->lookup_step; t > 1; --t) for (t = fs->lookup_step; t > 1; --t)
weight *= 1 - w_q; weight *= 1 - w_q;
fs->lookup_weight = (int)(weight * (1 << SCALE_RED)); fs->lookup_weight = (int)(weight * (1 << SCALE_RED));
#endif #endif /* code moved in the kernel */
} }
} }