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_sfq.c
diff --git
a/net/sched/sch_sfq.c
b/net/sched/sch_sfq.c
index
acf2666
..
f37d9cd
100644
(file)
--- a/
net/sched/sch_sfq.c
+++ b/
net/sched/sch_sfq.c
@@
-211,7
+211,7
@@
static inline void sfq_inc(struct sfq_sched_data *q, sfq_index x)
static unsigned int sfq_drop(struct Qdisc *sch)
{
static unsigned int sfq_drop(struct Qdisc *sch)
{
- struct sfq_sched_data *q =
(struct sfq_sched_data *)sch->data
;
+ struct sfq_sched_data *q =
qdisc_priv(sch)
;
sfq_index d = q->max_depth;
struct sk_buff *skb;
unsigned int len;
sfq_index d = q->max_depth;
struct sk_buff *skb;
unsigned int len;
@@
-253,7
+253,7
@@
static unsigned int sfq_drop(struct Qdisc *sch)
static int
sfq_enqueue(struct sk_buff *skb, struct Qdisc* sch)
{
static int
sfq_enqueue(struct sk_buff *skb, struct Qdisc* sch)
{
- struct sfq_sched_data *q =
(struct sfq_sched_data *)sch->data
;
+ struct sfq_sched_data *q =
qdisc_priv(sch)
;
unsigned hash = sfq_hash(q, skb);
sfq_index x;
unsigned hash = sfq_hash(q, skb);
sfq_index x;
@@
-288,7
+288,7
@@
sfq_enqueue(struct sk_buff *skb, struct Qdisc* sch)
static int
sfq_requeue(struct sk_buff *skb, struct Qdisc* sch)
{
static int
sfq_requeue(struct sk_buff *skb, struct Qdisc* sch)
{
- struct sfq_sched_data *q =
(struct sfq_sched_data *)sch->data
;
+ struct sfq_sched_data *q =
qdisc_priv(sch)
;
unsigned hash = sfq_hash(q, skb);
sfq_index x;
unsigned hash = sfq_hash(q, skb);
sfq_index x;
@@
-324,7
+324,7
@@
sfq_requeue(struct sk_buff *skb, struct Qdisc* sch)
static struct sk_buff *
sfq_dequeue(struct Qdisc* sch)
{
static struct sk_buff *
sfq_dequeue(struct Qdisc* sch)
{
- struct sfq_sched_data *q =
(struct sfq_sched_data *)sch->data
;
+ struct sfq_sched_data *q =
qdisc_priv(sch)
;
struct sk_buff *skb;
sfq_index a, old_a;
struct sk_buff *skb;
sfq_index a, old_a;
@@
-369,7
+369,7
@@
sfq_reset(struct Qdisc* sch)
static void sfq_perturbation(unsigned long arg)
{
struct Qdisc *sch = (struct Qdisc*)arg;
static void sfq_perturbation(unsigned long arg)
{
struct Qdisc *sch = (struct Qdisc*)arg;
- struct sfq_sched_data *q =
(struct sfq_sched_data *)sch->data
;
+ struct sfq_sched_data *q =
qdisc_priv(sch)
;
q->perturbation = net_random()&0x1F;
q->perturb_timer.expires = jiffies + q->perturb_period;
q->perturbation = net_random()&0x1F;
q->perturb_timer.expires = jiffies + q->perturb_period;
@@
-382,7
+382,7
@@
static void sfq_perturbation(unsigned long arg)
static int sfq_change(struct Qdisc *sch, struct rtattr *opt)
{
static int sfq_change(struct Qdisc *sch, struct rtattr *opt)
{
- struct sfq_sched_data *q =
(struct sfq_sched_data *)sch->data
;
+ struct sfq_sched_data *q =
qdisc_priv(sch)
;
struct tc_sfq_qopt *ctl = RTA_DATA(opt);
if (opt->rta_len < RTA_LENGTH(sizeof(*ctl)))
struct tc_sfq_qopt *ctl = RTA_DATA(opt);
if (opt->rta_len < RTA_LENGTH(sizeof(*ctl)))
@@
-408,7
+408,7
@@
static int sfq_change(struct Qdisc *sch, struct rtattr *opt)
static int sfq_init(struct Qdisc *sch, struct rtattr *opt)
{
static int sfq_init(struct Qdisc *sch, struct rtattr *opt)
{
- struct sfq_sched_data *q =
(struct sfq_sched_data *)sch->data
;
+ struct sfq_sched_data *q =
qdisc_priv(sch)
;
int i;
init_timer(&q->perturb_timer);
int i;
init_timer(&q->perturb_timer);
@@
-440,13
+440,13
@@
static int sfq_init(struct Qdisc *sch, struct rtattr *opt)
static void sfq_destroy(struct Qdisc *sch)
{
static void sfq_destroy(struct Qdisc *sch)
{
- struct sfq_sched_data *q =
(struct sfq_sched_data *)sch->data
;
+ struct sfq_sched_data *q =
qdisc_priv(sch)
;
del_timer(&q->perturb_timer);
}
static int sfq_dump(struct Qdisc *sch, struct sk_buff *skb)
{
del_timer(&q->perturb_timer);
}
static int sfq_dump(struct Qdisc *sch, struct sk_buff *skb)
{
- struct sfq_sched_data *q =
(struct sfq_sched_data *)sch->data
;
+ struct sfq_sched_data *q =
qdisc_priv(sch)
;
unsigned char *b = skb->tail;
struct tc_sfq_qopt opt;
unsigned char *b = skb->tail;
struct tc_sfq_qopt opt;