projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'pm-cpuidle' and 'pm-em'
[linux-2.6-microblaze.git]
/
net
/
sched
/
sch_codel.c
diff --git
a/net/sched/sch_codel.c
b/net/sched/sch_codel.c
index
1d94837
..
30169b3
100644
(file)
--- a/
net/sched/sch_codel.c
+++ b/
net/sched/sch_codel.c
@@
-108,7
+108,7
@@
static struct sk_buff *codel_qdisc_dequeue(struct Qdisc *sch)
return skb;
}
-static int codel_qdisc_enqueue(struct sk_buff *skb, struct Qdisc *sch,
spinlock_t *root_lock,
+static int codel_qdisc_enqueue(struct sk_buff *skb, struct Qdisc *sch,
struct sk_buff **to_free)
{
struct codel_sched_data *q;