net: remove trailing space in messages

[safe/jmp/linux-2.6] / net / sched / sch_tbf.c

diff --git a/net/sched/sch_tbf.c b/net/sched/sch_tbf.c
index 61fdc77..8fb8107 100644 (file)
--- a/net/sched/sch_tbf.c
+++ b/net/sched/sch_tbf.c
@@ -139,19 +139,6 @@ static int tbf_enqueue(struct sk_buff *skb, struct Qdisc* sch)
        return 0;
 }
 
-static int tbf_requeue(struct sk_buff *skb, struct Qdisc* sch)
-{
-       struct tbf_sched_data *q = qdisc_priv(sch);
-       int ret;
-
-       if ((ret = q->qdisc->ops->requeue(skb, q->qdisc)) == 0) {
-               sch->q.qlen++;
-               sch->qstats.requeues++;
-       }
-
-       return ret;
-}
-
 static unsigned int tbf_drop(struct Qdisc* sch)
 {
        struct tbf_sched_data *q = qdisc_priv(sch);
@@ -192,7 +179,7 @@ static struct sk_buff *tbf_dequeue(struct Qdisc* sch)
                toks -= L2T(q, len);
 
                if ((toks|ptoks) >= 0) {
-                       skb = q->qdisc->dequeue(q->qdisc);
+                       skb = qdisc_dequeue_peeked(q->qdisc);
                        if (unlikely(!skb))
                                return NULL;
 
@@ -297,7 +284,8 @@ static int tbf_change(struct Qdisc* sch, struct nlattr *opt)
        sch_tree_lock(sch);
        if (child) {
                qdisc_tree_decrease_qlen(q->qdisc, q->qdisc->q.qlen);
-               qdisc_destroy(xchg(&q->qdisc, child));
+               qdisc_destroy(q->qdisc);
+               q->qdisc = child;
        }
        q->limit = qopt->limit;
        q->mtu = qopt->mtu;
@@ -305,8 +293,10 @@ static int tbf_change(struct Qdisc* sch, struct nlattr *opt)
        q->buffer = qopt->buffer;
        q->tokens = q->buffer;
        q->ptokens = q->mtu;
-       rtab = xchg(&q->R_tab, rtab);
-       ptab = xchg(&q->P_tab, ptab);
+
+       swap(q->R_tab, rtab);
+       swap(q->P_tab, ptab);
+
        sch_tree_unlock(sch);
        err = 0;
 done:
@@ -378,9 +368,6 @@ static int tbf_dump_class(struct Qdisc *sch, unsigned long cl,
 {
        struct tbf_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;
 
@@ -396,7 +383,8 @@ static int tbf_graft(struct Qdisc *sch, unsigned long arg, struct Qdisc *new,
                new = &noop_qdisc;
 
        sch_tree_lock(sch);
-       *old = xchg(&q->qdisc, new);
+       *old = q->qdisc;
+       q->qdisc = new;
        qdisc_tree_decrease_qlen(*old, (*old)->q.qlen);
        qdisc_reset(*old);
        sch_tree_unlock(sch);
@@ -419,17 +407,6 @@ static void tbf_put(struct Qdisc *sch, unsigned long arg)
 {
 }
 
-static int tbf_change_class(struct Qdisc *sch, u32 classid, u32 parentid,
-                           struct nlattr **tca, unsigned long *arg)
-{
-       return -ENOSYS;
-}
-
-static int tbf_delete(struct Qdisc *sch, unsigned long arg)
-{
-       return -ENOSYS;
-}
-
 static void tbf_walk(struct Qdisc *sch, struct qdisc_walker *walker)
 {
        if (!walker->stop) {
@@ -442,21 +419,13 @@ static void tbf_walk(struct Qdisc *sch, struct qdisc_walker *walker)
        }
 }
 
-static struct tcf_proto **tbf_find_tcf(struct Qdisc *sch, unsigned long cl)
-{
-       return NULL;
-}
-
 static const struct Qdisc_class_ops tbf_class_ops =
 {
        .graft          =       tbf_graft,
        .leaf           =       tbf_leaf,
        .get            =       tbf_get,
        .put            =       tbf_put,
-       .change         =       tbf_change_class,
-       .delete         =       tbf_delete,
        .walk           =       tbf_walk,
-       .tcf_chain      =       tbf_find_tcf,
        .dump           =       tbf_dump_class,
 };
 
@@ -467,7 +436,7 @@ static struct Qdisc_ops tbf_qdisc_ops __read_mostly = {
        .priv_size      =       sizeof(struct tbf_sched_data),
        .enqueue        =       tbf_enqueue,
        .dequeue        =       tbf_dequeue,
-       .requeue        =       tbf_requeue,
+       .peek           =       qdisc_peek_dequeued,
        .drop           =       tbf_drop,
        .init           =       tbf_init,
        .reset          =       tbf_reset,