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 branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-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
507fb48
..
094a874
100644
(file)
--- a/
net/sched/sch_blackhole.c
+++ b/
net/sched/sch_blackhole.c
@@
-33,6
+33,7
@@
static struct Qdisc_ops blackhole_qdisc_ops __read_mostly = {
.priv_size = 0,
.enqueue = blackhole_enqueue,
.dequeue = blackhole_dequeue,
+ .peek = blackhole_dequeue,
.owner = THIS_MODULE,
};