net_sched: sch_plug: use a private throttled status

We want to get rid of generic qdisc throttled management,
so this qdisc has to use a private flag.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/sched/sch_plug.c b/net/sched/sch_plug.c
index ff0d968750df6d6c61e37c4bf78eb9c3bc96fa9b..a12cd37680f846576a7535c725b7c4bf0b5bbc6b 100644 (file)
--- a/net/sched/sch_plug.c
+++ b/net/sched/sch_plug.c
@@ -64,6 +64,8 @@ struct plug_sched_data {
         */
        bool unplug_indefinite;
 
+       bool throttled;
+
        /* Queue Limit in bytes */
        u32 limit;
 
@@ -103,7 +105,7 @@ static struct sk_buff *plug_dequeue(struct Qdisc *sch)
 {
        struct plug_sched_data *q = qdisc_priv(sch);
 
-       if (qdisc_is_throttled(sch))
+       if (q->throttled)
                return NULL;
 
        if (!q->unplug_indefinite) {
@@ -111,7 +113,7 @@ static struct sk_buff *plug_dequeue(struct Qdisc *sch)
                        /* No more packets to dequeue. Block the queue
                         * and wait for the next release command.
                         */
-                       qdisc_throttled(sch);
+                       q->throttled = true;
                        return NULL;
                }
                q->pkts_to_release--;
@@ -141,7 +143,7 @@ static int plug_init(struct Qdisc *sch, struct nlattr *opt)
                q->limit = ctl->limit;
        }
 
-       qdisc_throttled(sch);
+       q->throttled = true;
        return 0;
 }
 
@@ -173,7 +175,7 @@ static int plug_change(struct Qdisc *sch, struct nlattr *opt)
                q->pkts_last_epoch = q->pkts_current_epoch;
                q->pkts_current_epoch = 0;
                if (q->unplug_indefinite)
-                       qdisc_throttled(sch);
+                       q->throttled = true;
                q->unplug_indefinite = false;
                break;
        case TCQ_PLUG_RELEASE_ONE:
@@ -182,7 +184,7 @@ static int plug_change(struct Qdisc *sch, struct nlattr *opt)
                 */
                q->pkts_to_release += q->pkts_last_epoch;
                q->pkts_last_epoch = 0;
-               qdisc_unthrottled(sch);
+               q->throttled = false;
                netif_schedule_queue(sch->dev_queue);
                break;
        case TCQ_PLUG_RELEASE_INDEFINITE:
@@ -190,7 +192,7 @@ static int plug_change(struct Qdisc *sch, struct nlattr *opt)
                q->pkts_to_release = 0;
                q->pkts_last_epoch = 0;
                q->pkts_current_epoch = 0;
-               qdisc_unthrottled(sch);
+               q->throttled = false;
                netif_schedule_queue(sch->dev_queue);
                break;
        case TCQ_PLUG_LIMIT: