git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
[pandora-kernel.git]
/
net
/
sched
/
sch_blackhole.c
diff --git
a/net/sched/sch_blackhole.c
b/net/sched/sch_blackhole.c
index
f914fc4
..
094a874
100644
(file)
--- a/
net/sched/sch_blackhole.c
+++ b/
net/sched/sch_blackhole.c
@@
-28,11
+28,12
@@
static struct sk_buff *blackhole_dequeue(struct Qdisc *sch)
return NULL;
}
return NULL;
}
-static struct Qdisc_ops blackhole_qdisc_ops = {
+static struct Qdisc_ops blackhole_qdisc_ops
__read_mostly
= {
.id = "blackhole",
.priv_size = 0,
.enqueue = blackhole_enqueue,
.dequeue = blackhole_dequeue,
.id = "blackhole",
.priv_size = 0,
.enqueue = blackhole_enqueue,
.dequeue = blackhole_dequeue,
+ .peek = blackhole_dequeue,
.owner = THIS_MODULE,
};
.owner = THIS_MODULE,
};