diff options
| author | Patrick McHardy <kaber@trash.net> | 2006-03-21 04:00:49 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-03-21 04:00:49 +0100 |
| commit | 6d037a26f08711a222ed0d3d12b09e93eed7d3e8 (patch) | |
| tree | a200247459a6a378a1fb24847d383bddb09f5b67 /net/sched/sch_netem.c | |
| parent | [IRDA]: pci_register_driver conversion (diff) | |
| download | linux-6d037a26f08711a222ed0d3d12b09e93eed7d3e8.tar.xz linux-6d037a26f08711a222ed0d3d12b09e93eed7d3e8.zip | |
[PKT_SCHED]: Qdisc drop operation is optional
The drop operation is optional and qdiscs must check if childs support it.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_netem.c')
| -rw-r--r-- | net/sched/sch_netem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c index ba5283204837..7228d30512c7 100644 --- a/net/sched/sch_netem.c +++ b/net/sched/sch_netem.c @@ -252,9 +252,9 @@ static int netem_requeue(struct sk_buff *skb, struct Qdisc *sch) static unsigned int netem_drop(struct Qdisc* sch) { struct netem_sched_data *q = qdisc_priv(sch); - unsigned int len; + unsigned int len = 0; - if ((len = q->qdisc->ops->drop(q->qdisc)) != 0) { + if (q->qdisc->ops->drop && (len = q->qdisc->ops->drop(q->qdisc)) != 0) { sch->q.qlen--; sch->qstats.drops++; } |