VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / net / sched / sch_netem.c

diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c
index 70a3e8e..4d91d69 100644 (file)
--- a/net/sched/sch_netem.c
+++ b/net/sched/sch_netem.c
@@ -603,7 +603,7 @@ static inline int tabledist(int mu, int sigma)
  */
 static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch)
 {
-       struct netem_sched_data *q = (struct netem_sched_data *)sch->data;
+       struct netem_sched_data *q = qdisc_priv(sch);
        struct netem_skb_cb *cb = (struct netem_skb_cb *)skb->cb;
        psched_time_t now;
        long delay;
@@ -643,17 +643,23 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch)
        PSCHED_TADD2(now, delay, cb->time_to_send);
        
        /* Always queue at tail to keep packets in order */
-       __skb_queue_tail(&q->delayed, skb);
-       sch->q.qlen++;
-       sch->stats.bytes += skb->len;
-       sch->stats.packets++;
-       return 0;
+       if (likely(q->delayed.qlen < q->limit)) {
+               __skb_queue_tail(&q->delayed, skb);
+               sch->q.qlen++;
+               sch->stats.bytes += skb->len;
+               sch->stats.packets++;
+               return 0;
+       }
+
+       sch->stats.drops++;
+       kfree_skb(skb);
+       return NET_XMIT_DROP;
 }
 
 /* Requeue packets but don't change time stamp */
 static int netem_requeue(struct sk_buff *skb, struct Qdisc *sch)
 {
-       struct netem_sched_data *q = (struct netem_sched_data *)sch->data;
+       struct netem_sched_data *q = qdisc_priv(sch);
        int ret;
 
        if ((ret = q->qdisc->ops->requeue(skb, q->qdisc)) == 0)
@@ -664,7 +670,7 @@ static int netem_requeue(struct sk_buff *skb, struct Qdisc *sch)
 
 static unsigned int netem_drop(struct Qdisc* sch)
 {
-       struct netem_sched_data *q = (struct netem_sched_data *)sch->data;
+       struct netem_sched_data *q = qdisc_priv(sch);
        unsigned int len;
 
        if ((len = q->qdisc->ops->drop(q->qdisc)) != 0) {
@@ -680,7 +686,7 @@ static unsigned int netem_drop(struct Qdisc* sch)
  */
 static struct sk_buff *netem_dequeue(struct Qdisc *sch)
 {
-       struct netem_sched_data *q = (struct netem_sched_data *)sch->data;
+       struct netem_sched_data *q = qdisc_priv(sch);
        struct sk_buff *skb;
        psched_time_t now;
 
@@ -720,7 +726,7 @@ static void netem_watchdog(unsigned long arg)
 
 static void netem_reset(struct Qdisc *sch)
 {
-       struct netem_sched_data *q = (struct netem_sched_data *)sch->data;
+       struct netem_sched_data *q = qdisc_priv(sch);
 
        qdisc_reset(q->qdisc);
        skb_queue_purge(&q->delayed);
@@ -748,7 +754,7 @@ static int set_fifo_limit(struct Qdisc *q, int limit)
 
 static int netem_change(struct Qdisc *sch, struct rtattr *opt)
 {
-       struct netem_sched_data *q = (struct netem_sched_data *)sch->data;
+       struct netem_sched_data *q = qdisc_priv(sch);
        struct tc_netem_qopt *qopt = RTA_DATA(opt);
        struct Qdisc *child;
        int ret;
@@ -785,7 +791,7 @@ static int netem_change(struct Qdisc *sch, struct rtattr *opt)
 
 static int netem_init(struct Qdisc *sch, struct rtattr *opt)
 {
-       struct netem_sched_data *q = (struct netem_sched_data *)sch->data;
+       struct netem_sched_data *q = qdisc_priv(sch);
 
        if (!opt)
                return -EINVAL;
@@ -803,20 +809,21 @@ static int netem_init(struct Qdisc *sch, struct rtattr *opt)
 
 static void netem_destroy(struct Qdisc *sch)
 {
-       struct netem_sched_data *q = (struct netem_sched_data *)sch->data;
+       struct netem_sched_data *q = qdisc_priv(sch);
 
        del_timer_sync(&q->timer);
+       qdisc_destroy(q->qdisc);
 }
 
 static int netem_dump(struct Qdisc *sch, struct sk_buff *skb)
 {
-       struct netem_sched_data *q = (struct netem_sched_data *)sch->data;
+       struct netem_sched_data *q = qdisc_priv(sch);
        unsigned char    *b = skb->tail;
        struct tc_netem_qopt qopt;
 
        qopt.latency = q->latency;
        qopt.jitter = q->jitter;
-       qopt.limit = sch->dev->tx_queue_len;
+       qopt.limit = q->limit;
        qopt.loss = q->loss;
        qopt.gap = q->gap;
 
@@ -829,8 +836,95 @@ rtattr_failure:
        return -1;
 }
 
+static int netem_dump_class(struct Qdisc *sch, unsigned long cl,
+                         struct sk_buff *skb, struct tcmsg *tcm)
+{
+       struct netem_sched_data *q = qdisc_priv(sch);
+
+       if (cl != 1)    /* only one class */
+               return -ENOENT;
+
+       tcm->tcm_handle |= TC_H_MIN(1);
+       tcm->tcm_info = q->qdisc->handle;
+
+       return 0;
+}
+
+static int netem_graft(struct Qdisc *sch, unsigned long arg, struct Qdisc *new,
+                    struct Qdisc **old)
+{
+       struct netem_sched_data *q = qdisc_priv(sch);
+
+       if (new == NULL)
+               new = &noop_qdisc;
+
+       sch_tree_lock(sch);
+       *old = xchg(&q->qdisc, new);
+       qdisc_reset(*old);
+       sch->q.qlen = 0;
+       sch_tree_unlock(sch);
+
+       return 0;
+}
+
+static struct Qdisc *netem_leaf(struct Qdisc *sch, unsigned long arg)
+{
+       struct netem_sched_data *q = qdisc_priv(sch);
+       return q->qdisc;
+}
+
+static unsigned long netem_get(struct Qdisc *sch, u32 classid)
+{
+       return 1;
+}
+
+static void netem_put(struct Qdisc *sch, unsigned long arg)
+{
+}
+
+static int netem_change_class(struct Qdisc *sch, u32 classid, u32 parentid, 
+                           struct rtattr **tca, unsigned long *arg)
+{
+       return -ENOSYS;
+}
+
+static int netem_delete(struct Qdisc *sch, unsigned long arg)
+{
+       return -ENOSYS;
+}
+
+static void netem_walk(struct Qdisc *sch, struct qdisc_walker *walker)
+{
+       if (!walker->stop) {
+               if (walker->count >= walker->skip)
+                       if (walker->fn(sch, 1, walker) < 0) {
+                               walker->stop = 1;
+                               return;
+                       }
+               walker->count++;
+       }
+}
+
+static struct tcf_proto **netem_find_tcf(struct Qdisc *sch, unsigned long cl)
+{
+       return NULL;
+}
+
+static struct Qdisc_class_ops netem_class_ops = {
+       .graft          =       netem_graft,
+       .leaf           =       netem_leaf,
+       .get            =       netem_get,
+       .put            =       netem_put,
+       .change         =       netem_change_class,
+       .delete         =       netem_delete,
+       .walk           =       netem_walk,
+       .tcf_chain      =       netem_find_tcf,
+       .dump           =       netem_dump_class,
+};
+
 static struct Qdisc_ops netem_qdisc_ops = {
        .id             =       "netem",
+       .cl_ops         =       &netem_class_ops,
        .priv_size      =       sizeof(struct netem_sched_data),
        .enqueue        =       netem_enqueue,
        .dequeue        =       netem_dequeue,