git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[POWERPC] Add __init annotations to reserve_mem() and stabs_alloc()
[safe/jmp/linux-2.6]
/
net
/
sched
/
sch_dsmark.c
diff --git
a/net/sched/sch_dsmark.c
b/net/sched/sch_dsmark.c
index
45b5734
..
3c6fd18
100644
(file)
--- a/
net/sched/sch_dsmark.c
+++ b/
net/sched/sch_dsmark.c
@@
-220,13
+220,13
@@
static int dsmark_enqueue(struct sk_buff *skb,struct Qdisc *sch)
& ~INET_ECN_MASK;
break;
case __constant_htons(ETH_P_IPV6):
& ~INET_ECN_MASK;
break;
case __constant_htons(ETH_P_IPV6):
- skb->tc_index = ipv6_get_dsfield(
skb->nh.ipv6h
)
+ skb->tc_index = ipv6_get_dsfield(
ipv6_hdr(skb)
)
& ~INET_ECN_MASK;
break;
default:
skb->tc_index = 0;
break;
& ~INET_ECN_MASK;
break;
default:
skb->tc_index = 0;
break;
- }
;
+ }
}
if (TC_H_MAJ(skb->priority) == sch->handle)
}
if (TC_H_MAJ(skb->priority) == sch->handle)
@@
-257,7
+257,7
@@
static int dsmark_enqueue(struct sk_buff *skb,struct Qdisc *sch)
if (p->default_index != NO_DEFAULT_INDEX)
skb->tc_index = p->default_index;
break;
if (p->default_index != NO_DEFAULT_INDEX)
skb->tc_index = p->default_index;
break;
- }
;
+ }
}
err = p->q->enqueue(skb,p->q);
}
err = p->q->enqueue(skb,p->q);
@@
-296,7
+296,7
@@
static struct sk_buff *dsmark_dequeue(struct Qdisc *sch)
p->value[index]);
break;
case __constant_htons(ETH_P_IPV6):
p->value[index]);
break;
case __constant_htons(ETH_P_IPV6):
- ipv6_change_dsfield(
skb->nh.ipv6h
, p->mask[index],
+ ipv6_change_dsfield(
ipv6_hdr(skb)
, p->mask[index],
p->value[index]);
break;
default:
p->value[index]);
break;
default:
@@
-310,7
+310,7
@@
static struct sk_buff *dsmark_dequeue(struct Qdisc *sch)
"unsupported protocol %d\n",
ntohs(skb->protocol));
break;
"unsupported protocol %d\n",
ntohs(skb->protocol));
break;
- }
;
+ }
return skb;
}
return skb;
}
@@
-412,16
+412,10
@@
static void dsmark_reset(struct Qdisc *sch)
static void dsmark_destroy(struct Qdisc *sch)
{
struct dsmark_qdisc_data *p = PRIV(sch);
static void dsmark_destroy(struct Qdisc *sch)
{
struct dsmark_qdisc_data *p = PRIV(sch);
- struct tcf_proto *tp;
DPRINTK("dsmark_destroy(sch %p,[qdisc %p])\n", sch, p);
DPRINTK("dsmark_destroy(sch %p,[qdisc %p])\n", sch, p);
- while (p->filter_list) {
- tp = p->filter_list;
- p->filter_list = tp->next;
- tcf_destroy(tp);
- }
-
+ tcf_destroy_chain(p->filter_list);
qdisc_destroy(p->q);
kfree(p->mask);
}
qdisc_destroy(p->q);
kfree(p->mask);
}