Commit ded1a1fa authored by Andrew Morton's avatar Andrew Morton Committed by David S. Miller

[PKT_SCHED]: Fix pkt_sched.h warnings.

Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarDavid S. Miller <davem@redhat.com>
parent f03e885c
...@@ -321,7 +321,7 @@ int tcf_act_police(struct sk_buff **pskb, struct tc_action *a) ...@@ -321,7 +321,7 @@ int tcf_act_police(struct sk_buff **pskb, struct tc_action *a)
PSCHED_GET_TIME(now); PSCHED_GET_TIME(now);
toks = PSCHED_TDIFF_SAFE(now, p->t_c, p->burst, 0); toks = PSCHED_TDIFF_SAFE(now, p->t_c, p->burst, (void)0);
if (p->P_tab) { if (p->P_tab) {
ptoks = toks + p->ptoks; ptoks = toks + p->ptoks;
...@@ -523,7 +523,7 @@ int tcf_police(struct sk_buff *skb, struct tcf_police *p) ...@@ -523,7 +523,7 @@ int tcf_police(struct sk_buff *skb, struct tcf_police *p)
PSCHED_GET_TIME(now); PSCHED_GET_TIME(now);
toks = PSCHED_TDIFF_SAFE(now, p->t_c, p->burst, 0); toks = PSCHED_TDIFF_SAFE(now, p->t_c, p->burst, (void)0);
if (p->P_tab) { if (p->P_tab) {
ptoks = toks + p->ptoks; ptoks = toks + p->ptoks;
......
...@@ -155,7 +155,7 @@ gred_enqueue(struct sk_buff *skb, struct Qdisc* sch) ...@@ -155,7 +155,7 @@ gred_enqueue(struct sk_buff *skb, struct Qdisc* sch)
if (!PSCHED_IS_PASTPERFECT(q->qidlestart)) { if (!PSCHED_IS_PASTPERFECT(q->qidlestart)) {
long us_idle; long us_idle;
PSCHED_GET_TIME(now); PSCHED_GET_TIME(now);
us_idle = PSCHED_TDIFF_SAFE(now, q->qidlestart, q->Scell_max, 0); us_idle = PSCHED_TDIFF_SAFE(now, q->qidlestart, q->Scell_max, (void)0);
PSCHED_SET_PASTPERFECT(q->qidlestart); PSCHED_SET_PASTPERFECT(q->qidlestart);
q->qave >>= q->Stab[(us_idle>>q->Scell_log)&0xFF]; q->qave >>= q->Stab[(us_idle>>q->Scell_log)&0xFF];
...@@ -551,7 +551,7 @@ static int gred_dump(struct Qdisc *sch, struct sk_buff *skb) ...@@ -551,7 +551,7 @@ static int gred_dump(struct Qdisc *sch, struct sk_buff *skb)
long idle; long idle;
psched_time_t now; psched_time_t now;
PSCHED_GET_TIME(now); PSCHED_GET_TIME(now);
idle = PSCHED_TDIFF_SAFE(now, q->qidlestart, q->Scell_max, 0); idle = PSCHED_TDIFF_SAFE(now, q->qidlestart, q->Scell_max, (void)0);
qave = q->qave >> q->Stab[(idle>>q->Scell_log)&0xFF]; qave = q->qave >> q->Stab[(idle>>q->Scell_log)&0xFF];
dst->qave = qave >> q->Wlog; dst->qave = qave >> q->Wlog;
......
...@@ -367,7 +367,7 @@ static void htb_debug_dump (struct htb_sched *q) ...@@ -367,7 +367,7 @@ static void htb_debug_dump (struct htb_sched *q)
struct list_head *l; struct list_head *l;
list_for_each (l,q->hash+i) { list_for_each (l,q->hash+i) {
struct htb_class *cl = list_entry(l,struct htb_class,hlist); struct htb_class *cl = list_entry(l,struct htb_class,hlist);
long diff = PSCHED_TDIFF_SAFE(q->now, cl->t_c, (u32)cl->mbuffer, 0); long diff = PSCHED_TDIFF_SAFE(q->now, cl->t_c, (u32)cl->mbuffer, (void)0);
printk(KERN_DEBUG "htb*c%x m=%d t=%ld c=%ld pq=%lu df=%ld ql=%d " printk(KERN_DEBUG "htb*c%x m=%d t=%ld c=%ld pq=%lu df=%ld ql=%d "
"pa=%x f:", "pa=%x f:",
cl->classid,cl->cmode,cl->tokens,cl->ctokens, cl->classid,cl->cmode,cl->tokens,cl->ctokens,
...@@ -807,7 +807,7 @@ static void htb_charge_class(struct htb_sched *q,struct htb_class *cl, ...@@ -807,7 +807,7 @@ static void htb_charge_class(struct htb_sched *q,struct htb_class *cl,
while (cl) { while (cl) {
HTB_CHCL(cl); HTB_CHCL(cl);
diff = PSCHED_TDIFF_SAFE(q->now, cl->t_c, (u32)cl->mbuffer, 0); diff = PSCHED_TDIFF_SAFE(q->now, cl->t_c, (u32)cl->mbuffer, (void)0);
#ifdef HTB_DEBUG #ifdef HTB_DEBUG
if (diff > cl->mbuffer || diff < 0 || PSCHED_TLESS(q->now, cl->t_c)) { if (diff > cl->mbuffer || diff < 0 || PSCHED_TLESS(q->now, cl->t_c)) {
if (net_ratelimit()) if (net_ratelimit())
...@@ -878,7 +878,7 @@ static long htb_do_events(struct htb_sched *q,int level) ...@@ -878,7 +878,7 @@ static long htb_do_events(struct htb_sched *q,int level)
return cl->pq_key - q->jiffies; return cl->pq_key - q->jiffies;
} }
htb_safe_rb_erase(p,q->wait_pq+level); htb_safe_rb_erase(p,q->wait_pq+level);
diff = PSCHED_TDIFF_SAFE(q->now, cl->t_c, (u32)cl->mbuffer, 0); diff = PSCHED_TDIFF_SAFE(q->now, cl->t_c, (u32)cl->mbuffer, (void)0);
#ifdef HTB_DEBUG #ifdef HTB_DEBUG
if (diff > cl->mbuffer || diff < 0 || PSCHED_TLESS(q->now, cl->t_c)) { if (diff > cl->mbuffer || diff < 0 || PSCHED_TLESS(q->now, cl->t_c)) {
if (net_ratelimit()) if (net_ratelimit())
......
...@@ -189,7 +189,7 @@ red_enqueue(struct sk_buff *skb, struct Qdisc* sch) ...@@ -189,7 +189,7 @@ red_enqueue(struct sk_buff *skb, struct Qdisc* sch)
int shift; int shift;
PSCHED_GET_TIME(now); PSCHED_GET_TIME(now);
us_idle = PSCHED_TDIFF_SAFE(now, q->qidlestart, q->Scell_max, 0); us_idle = PSCHED_TDIFF_SAFE(now, q->qidlestart, q->Scell_max, (void)0);
PSCHED_SET_PASTPERFECT(q->qidlestart); PSCHED_SET_PASTPERFECT(q->qidlestart);
/* /*
......
...@@ -207,7 +207,7 @@ static struct sk_buff *tbf_dequeue(struct Qdisc* sch) ...@@ -207,7 +207,7 @@ static struct sk_buff *tbf_dequeue(struct Qdisc* sch)
PSCHED_GET_TIME(now); 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, (void)0);
if (q->P_tab) { if (q->P_tab) {
ptoks = toks + q->ptokens; ptoks = toks + q->ptokens;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment