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.infradead.org/mtd-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
81f0b83
..
507fb48
100644
(file)
--- a/
net/sched/sch_blackhole.c
+++ b/
net/sched/sch_blackhole.c
@@
-11,11
+11,9
@@
* Note: Quantum tunneling is not supported.
*/
* Note: Quantum tunneling is not supported.
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/kernel.h>
-#include <linux/netdevice.h>
#include <linux/skbuff.h>
#include <net/pkt_sched.h>
#include <linux/skbuff.h>
#include <net/pkt_sched.h>
@@
-30,7
+28,7
@@
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,
.id = "blackhole",
.priv_size = 0,
.enqueue = blackhole_enqueue,