git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
net
/
sched
/
sch_tbf.c
diff --git
a/net/sched/sch_tbf.c
b/net/sched/sch_tbf.c
index
7854980
..
a1df304
100644
(file)
--- a/
net/sched/sch_tbf.c
+++ b/
net/sched/sch_tbf.c
@@
-137,7
+137,7
@@
struct tbf_sched_data
static int tbf_enqueue(struct sk_buff *skb, struct Qdisc* sch)
{
static int tbf_enqueue(struct sk_buff *skb, struct Qdisc* sch)
{
- struct tbf_sched_data *q =
(struct tbf_sched_data *)sch->data
;
+ struct tbf_sched_data *q =
qdisc_priv(sch)
;
int ret;
if (skb->len > q->max_size) {
int ret;
if (skb->len > q->max_size) {
@@
-163,7
+163,7
@@
static int tbf_enqueue(struct sk_buff *skb, struct Qdisc* sch)
static int tbf_requeue(struct sk_buff *skb, struct Qdisc* sch)
{
static int tbf_requeue(struct sk_buff *skb, struct Qdisc* sch)
{
- struct tbf_sched_data *q =
(struct tbf_sched_data *)sch->data
;
+ struct tbf_sched_data *q =
qdisc_priv(sch)
;
int ret;
if ((ret = q->qdisc->ops->requeue(skb, q->qdisc)) == 0)
int ret;
if ((ret = q->qdisc->ops->requeue(skb, q->qdisc)) == 0)
@@
-174,7
+174,7
@@
static int tbf_requeue(struct sk_buff *skb, struct Qdisc* sch)
static unsigned int tbf_drop(struct Qdisc* sch)
{
static unsigned int tbf_drop(struct Qdisc* sch)
{
- struct tbf_sched_data *q =
(struct tbf_sched_data *)sch->data
;
+ struct tbf_sched_data *q =
qdisc_priv(sch)
;
unsigned int len;
if ((len = q->qdisc->ops->drop(q->qdisc)) != 0) {
unsigned int len;
if ((len = q->qdisc->ops->drop(q->qdisc)) != 0) {
@@
-194,20
+194,20
@@
static void tbf_watchdog(unsigned long arg)
static struct sk_buff *tbf_dequeue(struct Qdisc* sch)
{
static struct sk_buff *tbf_dequeue(struct Qdisc* sch)
{
- struct tbf_sched_data *q =
(struct tbf_sched_data *)sch->data
;
+ struct tbf_sched_data *q =
qdisc_priv(sch)
;
struct sk_buff *skb;
skb = q->qdisc->dequeue(q->qdisc);
if (skb) {
psched_time_t now;
struct sk_buff *skb;
skb = q->qdisc->dequeue(q->qdisc);
if (skb) {
psched_time_t now;
- long toks;
+ long toks
, delay
;
long ptoks = 0;
unsigned int len = skb->len;
PSCHED_GET_TIME(now);
long ptoks = 0;
unsigned int len = skb->len;
PSCHED_GET_TIME(now);
- toks = PSCHED_TDIFF_SAFE(now, q->t_c, q->buffer
, 0
);
+ toks = PSCHED_TDIFF_SAFE(now, q->t_c, q->buffer);
if (q->P_tab) {
ptoks = toks + q->ptokens;
if (q->P_tab) {
ptoks = toks + q->ptokens;
@@
-229,14
+229,12
@@
static struct sk_buff *tbf_dequeue(struct Qdisc* sch)
return skb;
}
return skb;
}
- if (!netif_queue_stopped(sch->dev)) {
- long delay = PSCHED_US2JIFFIE(max_t(long, -toks, -ptoks));
+ delay = PSCHED_US2JIFFIE(max_t(long, -toks, -ptoks));
-
if (delay == 0)
-
delay = 1;
+ if (delay == 0)
+ delay = 1;
- mod_timer(&q->wd_timer, jiffies+delay);
- }
+ mod_timer(&q->wd_timer, jiffies+delay);
/* Maybe we have a shorter packet in the queue,
which can be sent now. It sounds cool,
/* Maybe we have a shorter packet in the queue,
which can be sent now. It sounds cool,
@@
-263,7
+261,7
@@
static struct sk_buff *tbf_dequeue(struct Qdisc* sch)
static void tbf_reset(struct Qdisc* sch)
{
static void tbf_reset(struct Qdisc* sch)
{
- struct tbf_sched_data *q =
(struct tbf_sched_data *)sch->data
;
+ struct tbf_sched_data *q =
qdisc_priv(sch)
;
qdisc_reset(q->qdisc);
sch->q.qlen = 0;
qdisc_reset(q->qdisc);
sch->q.qlen = 0;
@@
-302,7
+300,7
@@
static struct Qdisc *tbf_create_dflt_qdisc(struct net_device *dev, u32 limit)
static int tbf_change(struct Qdisc* sch, struct rtattr *opt)
{
int err = -EINVAL;
static int tbf_change(struct Qdisc* sch, struct rtattr *opt)
{
int err = -EINVAL;
- struct tbf_sched_data *q =
(struct tbf_sched_data *)sch->data
;
+ struct tbf_sched_data *q =
qdisc_priv(sch)
;
struct rtattr *tb[TCA_TBF_PTAB];
struct tc_tbf_qopt *qopt;
struct qdisc_rate_table *rtab = NULL;
struct rtattr *tb[TCA_TBF_PTAB];
struct tc_tbf_qopt *qopt;
struct qdisc_rate_table *rtab = NULL;
@@
-368,7
+366,7
@@
done:
static int tbf_init(struct Qdisc* sch, struct rtattr *opt)
{
static int tbf_init(struct Qdisc* sch, struct rtattr *opt)
{
- struct tbf_sched_data *q =
(struct tbf_sched_data *)sch->data
;
+ struct tbf_sched_data *q =
qdisc_priv(sch)
;
if (opt == NULL)
return -EINVAL;
if (opt == NULL)
return -EINVAL;
@@
-385,7
+383,7
@@
static int tbf_init(struct Qdisc* sch, struct rtattr *opt)
static void tbf_destroy(struct Qdisc *sch)
{
static void tbf_destroy(struct Qdisc *sch)
{
- struct tbf_sched_data *q =
(struct tbf_sched_data *)sch->data
;
+ struct tbf_sched_data *q =
qdisc_priv(sch)
;
del_timer(&q->wd_timer);
del_timer(&q->wd_timer);
@@
-395,12
+393,11
@@
static void tbf_destroy(struct Qdisc *sch)
qdisc_put_rtab(q->R_tab);
qdisc_destroy(q->qdisc);
qdisc_put_rtab(q->R_tab);
qdisc_destroy(q->qdisc);
- q->qdisc = &noop_qdisc;
}
static int tbf_dump(struct Qdisc *sch, struct sk_buff *skb)
{
}
static int tbf_dump(struct Qdisc *sch, struct sk_buff *skb)
{
- struct tbf_sched_data *q =
(struct tbf_sched_data *)sch->data
;
+ struct tbf_sched_data *q =
qdisc_priv(sch)
;
unsigned char *b = skb->tail;
struct rtattr *rta;
struct tc_tbf_qopt opt;
unsigned char *b = skb->tail;
struct rtattr *rta;
struct tc_tbf_qopt opt;
@@
-429,7
+426,7
@@
rtattr_failure:
static int tbf_dump_class(struct Qdisc *sch, unsigned long cl,
struct sk_buff *skb, struct tcmsg *tcm)
{
static int tbf_dump_class(struct Qdisc *sch, unsigned long cl,
struct sk_buff *skb, struct tcmsg *tcm)
{
- struct tbf_sched_data *q =
(struct tbf_sched_data*)sch->data
;
+ struct tbf_sched_data *q =
qdisc_priv(sch)
;
if (cl != 1) /* only one class */
return -ENOENT;
if (cl != 1) /* only one class */
return -ENOENT;
@@
-443,7
+440,7
@@
static int tbf_dump_class(struct Qdisc *sch, unsigned long cl,
static int tbf_graft(struct Qdisc *sch, unsigned long arg, struct Qdisc *new,
struct Qdisc **old)
{
static int tbf_graft(struct Qdisc *sch, unsigned long arg, struct Qdisc *new,
struct Qdisc **old)
{
- struct tbf_sched_data *q =
(struct tbf_sched_data *)sch->data
;
+ struct tbf_sched_data *q =
qdisc_priv(sch)
;
if (new == NULL)
new = &noop_qdisc;
if (new == NULL)
new = &noop_qdisc;
@@
-459,7
+456,7
@@
static int tbf_graft(struct Qdisc *sch, unsigned long arg, struct Qdisc *new,
static struct Qdisc *tbf_leaf(struct Qdisc *sch, unsigned long arg)
{
static struct Qdisc *tbf_leaf(struct Qdisc *sch, unsigned long arg)
{
- struct tbf_sched_data *q =
(struct tbf_sched_data *)sch->data
;
+ struct tbf_sched_data *q =
qdisc_priv(sch)
;
return q->qdisc;
}
return q->qdisc;
}