net: sched: pie: fix coding style issues

Fix 5 warnings and 14 checks issued by checkpatch.pl:

CHECK: Logical continuations should be on the previous line
+	if ((q->vars.qdelay < q->params.target / 2)
+	    && (q->vars.prob < MAX_PROB / 5))

WARNING: line over 80 characters
+		q->params.tupdate = usecs_to_jiffies(nla_get_u32(tb[TCA_PIE_TUPDATE]));

CHECK: Blank lines aren't necessary after an open brace '{'
+{
+

CHECK: braces {} should be used on all arms of this statement
+			if (qlen < QUEUE_THRESHOLD)
[...]
+			else {
[...]

CHECK: Unbalanced braces around else statement
+			else {

CHECK: No space is necessary after a cast
+	if (delta > (s32) (MAX_PROB / (100 / 2)) &&

CHECK: Unnecessary parentheses around 'qdelay == 0'
+	if ((qdelay == 0) && (qdelay_old == 0) && update_prob)

CHECK: Unnecessary parentheses around 'qdelay_old == 0'
+	if ((qdelay == 0) && (qdelay_old == 0) && update_prob)

CHECK: Unnecessary parentheses around 'q->vars.prob == 0'
+	if ((q->vars.qdelay < q->params.target / 2) &&
+	    (q->vars.qdelay_old < q->params.target / 2) &&
+	    (q->vars.prob == 0) &&
+	    (q->vars.avg_dq_rate > 0))

CHECK: Unnecessary parentheses around 'q->vars.avg_dq_rate > 0'
+	if ((q->vars.qdelay < q->params.target / 2) &&
+	    (q->vars.qdelay_old < q->params.target / 2) &&
+	    (q->vars.prob == 0) &&
+	    (q->vars.avg_dq_rate > 0))

CHECK: Blank lines aren't necessary before a close brace '}'
+
+}

CHECK: Comparison to NULL could be written "!opts"
+	if (opts == NULL)

CHECK: No space is necessary after a cast
+			((u32) PSCHED_TICKS2NS(q->params.target)) /

WARNING: line over 80 characters
+	    nla_put_u32(skb, TCA_PIE_TUPDATE, jiffies_to_usecs(q->params.tupdate)) ||

CHECK: Blank lines aren't necessary before a close brace '}'
+
+}

CHECK: No space is necessary after a cast
+		.delay		= ((u32) PSCHED_TICKS2NS(q->vars.qdelay)) /

WARNING: Missing a blank line after declarations
+	struct sk_buff *skb;
+	skb = qdisc_dequeue_head(sch);

WARNING: Missing a blank line after declarations
+	struct pie_sched_data *q = qdisc_priv(sch);
+	qdisc_reset_queue(sch);

WARNING: Missing a blank line after declarations
+	struct pie_sched_data *q = qdisc_priv(sch);
+	q->params.tupdate = 0;

Signed-off-by: Leslie Monis <lesliemonis@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/sched/sch_pie.c b/net/sched/sch_pie.c
index 18d30bb86881aba8a5c5521181cba11038945672..d1429371592fc0f2cb407a72eff1e01b16d9fadc 100644 (file)
--- a/net/sched/sch_pie.c
+++ b/net/sched/sch_pie.c
@@ -110,8 +110,8 @@ static bool drop_early(struct Qdisc *sch, u32 packet_size)
        /* If current delay is less than half of target, and
         * if drop prob is low already, disable early_drop
         */
-       if ((q->vars.qdelay < q->params.target / 2)
-           && (q->vars.prob < MAX_PROB / 5))
+       if ((q->vars.qdelay < q->params.target / 2) &&
+           (q->vars.prob < MAX_PROB / 5))
                return false;
 
        /* If we have fewer than 2 mtu-sized packets, disable drop_early,
@@ -209,7 +209,8 @@ static int pie_change(struct Qdisc *sch, struct nlattr *opt,
 
        /* tupdate is in jiffies */
        if (tb[TCA_PIE_TUPDATE])
-               q->params.tupdate = usecs_to_jiffies(nla_get_u32(tb[TCA_PIE_TUPDATE]));
+               q->params.tupdate =
+                       usecs_to_jiffies(nla_get_u32(tb[TCA_PIE_TUPDATE]));
 
        if (tb[TCA_PIE_LIMIT]) {
                u32 limit = nla_get_u32(tb[TCA_PIE_LIMIT]);
@@ -247,7 +248,6 @@ static int pie_change(struct Qdisc *sch, struct nlattr *opt,
 
 static void pie_process_dequeue(struct Qdisc *sch, struct sk_buff *skb)
 {
-
        struct pie_sched_data *q = qdisc_priv(sch);
        int qlen = sch->qstats.backlog; /* current queue size in bytes */
 
@@ -294,9 +294,9 @@ static void pie_process_dequeue(struct Qdisc *sch, struct sk_buff *skb)
                         * dq_count to 0 to re-enter the if block when the next
                         * packet is dequeued
                         */
-                       if (qlen < QUEUE_THRESHOLD)
+                       if (qlen < QUEUE_THRESHOLD) {
                                q->vars.dq_count = DQCOUNT_INVALID;
-                       else {
+                       } else {
                                q->vars.dq_count = 0;
                                q->vars.dq_tstamp = psched_get_time();
                        }
@@ -370,7 +370,7 @@ static void calculate_probability(struct Qdisc *sch)
        oldprob = q->vars.prob;
 
        /* to ensure we increase probability in steps of no more than 2% */
-       if (delta > (s32) (MAX_PROB / (100 / 2)) &&
+       if (delta > (s32)(MAX_PROB / (100 / 2)) &&
            q->vars.prob >= MAX_PROB / 10)
                delta = (MAX_PROB / 100) * 2;
 
@@ -405,7 +405,7 @@ static void calculate_probability(struct Qdisc *sch)
         * delay is 0 for 2 consecutive Tupdate periods.
         */
 
-       if ((qdelay == 0) && (qdelay_old == 0) && update_prob)
+       if (qdelay == 0 && qdelay_old == 0 && update_prob)
                q->vars.prob = (q->vars.prob * 98) / 100;
 
        q->vars.qdelay = qdelay;
@@ -419,8 +419,8 @@ static void calculate_probability(struct Qdisc *sch)
         */
        if ((q->vars.qdelay < q->params.target / 2) &&
            (q->vars.qdelay_old < q->params.target / 2) &&
-           (q->vars.prob == 0) &&
-           (q->vars.avg_dq_rate > 0))
+           q->vars.prob == 0 &&
+           q->vars.avg_dq_rate > 0)
                pie_vars_init(&q->vars);
 }
 
@@ -437,7 +437,6 @@ static void pie_timer(struct timer_list *t)
        if (q->params.tupdate)
                mod_timer(&q->adapt_timer, jiffies + q->params.tupdate);
        spin_unlock(root_lock);
-
 }
 
 static int pie_init(struct Qdisc *sch, struct nlattr *opt,
@@ -469,15 +468,16 @@ static int pie_dump(struct Qdisc *sch, struct sk_buff *skb)
        struct nlattr *opts;
 
        opts = nla_nest_start(skb, TCA_OPTIONS);
-       if (opts == NULL)
+       if (!opts)
                goto nla_put_failure;
 
        /* convert target from pschedtime to us */
        if (nla_put_u32(skb, TCA_PIE_TARGET,
-                       ((u32) PSCHED_TICKS2NS(q->params.target)) /
+                       ((u32)PSCHED_TICKS2NS(q->params.target)) /
                        NSEC_PER_USEC) ||
            nla_put_u32(skb, TCA_PIE_LIMIT, sch->limit) ||
-           nla_put_u32(skb, TCA_PIE_TUPDATE, jiffies_to_usecs(q->params.tupdate)) ||
+           nla_put_u32(skb, TCA_PIE_TUPDATE,
+                       jiffies_to_usecs(q->params.tupdate)) ||
            nla_put_u32(skb, TCA_PIE_ALPHA, q->params.alpha) ||
            nla_put_u32(skb, TCA_PIE_BETA, q->params.beta) ||
            nla_put_u32(skb, TCA_PIE_ECN, q->params.ecn) ||
@@ -489,7 +489,6 @@ static int pie_dump(struct Qdisc *sch, struct sk_buff *skb)
 nla_put_failure:
        nla_nest_cancel(skb, opts);
        return -1;
-
 }
 
 static int pie_dump_stats(struct Qdisc *sch, struct gnet_dump *d)
@@ -497,7 +496,7 @@ static int pie_dump_stats(struct Qdisc *sch, struct gnet_dump *d)
        struct pie_sched_data *q = qdisc_priv(sch);
        struct tc_pie_xstats st = {
                .prob           = q->vars.prob,
-               .delay          = ((u32) PSCHED_TICKS2NS(q->vars.qdelay)) /
+               .delay          = ((u32)PSCHED_TICKS2NS(q->vars.qdelay)) /
                                   NSEC_PER_USEC,
                /* unscale and return dq_rate in bytes per sec */
                .avg_dq_rate    = q->vars.avg_dq_rate *
@@ -514,8 +513,7 @@ static int pie_dump_stats(struct Qdisc *sch, struct gnet_dump *d)
 
 static struct sk_buff *pie_qdisc_dequeue(struct Qdisc *sch)
 {
-       struct sk_buff *skb;
-       skb = qdisc_dequeue_head(sch);
+       struct sk_buff *skb = qdisc_dequeue_head(sch);
 
        if (!skb)
                return NULL;
@@ -527,6 +525,7 @@ static struct sk_buff *pie_qdisc_dequeue(struct Qdisc *sch)
 static void pie_reset(struct Qdisc *sch)
 {
        struct pie_sched_data *q = qdisc_priv(sch);
+
        qdisc_reset_queue(sch);
        pie_vars_init(&q->vars);
 }
@@ -534,6 +533,7 @@ static void pie_reset(struct Qdisc *sch)
 static void pie_destroy(struct Qdisc *sch)
 {
        struct pie_sched_data *q = qdisc_priv(sch);
+
        q->params.tupdate = 0;
        del_timer_sync(&q->adapt_timer);
 }