tc: red, gred: Rename overloaded variable wlog

It is used when parsing three different parameters, only one of
which is Wlog. Change the name to make the code less confusing.

Signed-off-by: David Ward <david.ward@ll.mit.edu>

diff --git a/tc/q_gred.c b/tc/q_gred.c
index 88bd0947f77804f966b93bef56a3f0d72bab6aaf..625bcf96aa4550336429ca50c61c0beb2489f6e2 100644 (file)
--- a/tc/q_gred.c
+++ b/tc/q_gred.c
@@ -123,7 +123,7 @@ static int gred_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct n
        unsigned avpkt = 0;
        double probability = 0.02;
        unsigned rate = 0;
-       int wlog;
+       int parm;
        __u8 sbuf[256];
        struct rtattr *tail;
        __u32 max_P;
@@ -227,27 +227,26 @@ static int gred_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct n
                burst = (2 * opt.qth_min + opt.qth_max) / (3 * avpkt);
                fprintf(stderr, "GRED: set burst to %u\n", burst);
        }
-
-       if ((wlog = tc_red_eval_ewma(opt.qth_min, burst, avpkt)) < 0) {
+       if ((parm = tc_red_eval_ewma(opt.qth_min, burst, avpkt)) < 0) {
                fprintf(stderr, "GRED: failed to calculate EWMA constant.\n");
                return -1;
        }
-       if (wlog >= 10)
+       if (parm >= 10)
                fprintf(stderr, "GRED: WARNING. Burst %d seems to be too "
                    "large.\n", burst);
-       opt.Wlog = wlog;
-       if ((wlog = tc_red_eval_P(opt.qth_min, opt.qth_max, probability)) < 0) {
+       opt.Wlog = parm;
+       if ((parm = tc_red_eval_P(opt.qth_min, opt.qth_max, probability)) < 0) {
                fprintf(stderr, "GRED: failed to calculate probability.\n");
                return -1;
        }
-       opt.Plog = wlog;
-       if ((wlog = tc_red_eval_idle_damping(opt.Wlog, avpkt, rate, sbuf)) < 0)
+       opt.Plog = parm;
+       if ((parm = tc_red_eval_idle_damping(opt.Wlog, avpkt, rate, sbuf)) < 0)
            {
                fprintf(stderr, "GRED: failed to calculate idle damping "
                    "table.\n");
                return -1;
        }
-       opt.Scell_log = wlog;
+       opt.Scell_log = parm;
 
        tail = NLMSG_TAIL(n);
        addattr_l(n, 1024, TCA_OPTIONS, NULL, 0);

diff --git a/tc/q_red.c b/tc/q_red.c
index 89e7320181d52ae0c966580c1192f88046842339..5a74c5006017cbbc9326b4e14683f7672ce21fdb 100644 (file)
--- a/tc/q_red.c
+++ b/tc/q_red.c
@@ -40,7 +40,7 @@ static int red_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct nl
        unsigned avpkt = 0;
        double probability = 0.02;
        unsigned rate = 0;
-       int wlog;
+       int parm;
        __u8 sbuf[256];
        __u32 max_P;
        struct rtattr *tail;
@@ -126,23 +126,23 @@ static int red_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct nl
                opt.qth_min = opt.qth_max / 3;
        if (!burst)
                burst = (2 * opt.qth_min + opt.qth_max) / (3 * avpkt);
-       if ((wlog = tc_red_eval_ewma(opt.qth_min, burst, avpkt)) < 0) {
+       if ((parm = tc_red_eval_ewma(opt.qth_min, burst, avpkt)) < 0) {
                fprintf(stderr, "RED: failed to calculate EWMA constant.\n");
                return -1;
        }
-       if (wlog >= 10)
+       if (parm >= 10)
                fprintf(stderr, "RED: WARNING. Burst %d seems to be too large.\n", burst);
-       opt.Wlog = wlog;
-       if ((wlog = tc_red_eval_P(opt.qth_min, opt.qth_max, probability)) < 0) {
+       opt.Wlog = parm;
+       if ((parm = tc_red_eval_P(opt.qth_min, opt.qth_max, probability)) < 0) {
                fprintf(stderr, "RED: failed to calculate probability.\n");
                return -1;
        }
-       opt.Plog = wlog;
-       if ((wlog = tc_red_eval_idle_damping(opt.Wlog, avpkt, rate, sbuf)) < 0) {
+       opt.Plog = parm;
+       if ((parm = tc_red_eval_idle_damping(opt.Wlog, avpkt, rate, sbuf)) < 0) {
                fprintf(stderr, "RED: failed to calculate idle damping table.\n");
                return -1;
        }
-       opt.Scell_log = wlog;
+       opt.Scell_log = parm;
 
        tail = NLMSG_TAIL(n);
        addattr_l(n, 1024, TCA_OPTIONS, NULL, 0);