Skip to content

Commit

Permalink
[PKT_SCHED]: GRED: Remove initd flag
Browse files Browse the repository at this point in the history
The case when the default VQ is not set up yet is already handled
in a less error prone way.

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
  • Loading branch information
Thomas Graf authored and Thomas Graf committed Nov 5, 2005
1 parent 18e3fb8 commit 4a59183
Showing 1 changed file with 1 addition and 14 deletions.
15 changes: 1 addition & 14 deletions net/sched/sch_gred.c
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ struct gred_sched
unsigned long flags;
u32 DPs;
u32 def;
u8 initd;
};

static inline int gred_wred_mode(struct gred_sched *table)
Expand Down Expand Up @@ -166,14 +165,7 @@ gred_enqueue(struct sk_buff *skb, struct Qdisc* sch)
struct gred_sched *t= qdisc_priv(sch);
unsigned long qavg = 0;
int i=0;
u16 dp;

if (!t->initd && skb_queue_len(&sch->q) < (sch->dev->tx_queue_len ? : 1)) {
D2PRINTK("NO GRED Queues setup yet! Enqueued anyway\n");
goto do_enqueue;
}

dp = tc_index_to_dp(skb);
u16 dp = tc_index_to_dp(skb);

if (dp >= t->DPs || (q = t->tab[dp]) == NULL) {
dp = t->def;
Expand Down Expand Up @@ -241,7 +233,6 @@ gred_enqueue(struct sk_buff *skb, struct Qdisc* sch)

if (q->backlog + skb->len <= q->limit) {
q->backlog += skb->len;
do_enqueue:
return qdisc_enqueue_tail(skb, sch);
}

Expand Down Expand Up @@ -420,8 +411,6 @@ static inline int gred_change_table_def(struct Qdisc *sch, struct rtattr *dps)
}
}

table->initd = 0;

return 0;
}

Expand Down Expand Up @@ -509,8 +498,6 @@ static int gred_change(struct Qdisc *sch, struct rtattr *opt)
goto errout_locked;
}

table->initd = 1;

if (gred_rio_mode(table)) {
gred_disable_wred_mode(table);
if (gred_wred_mode_check(sch))
Expand Down

0 comments on commit 4a59183

Please sign in to comment.