Merge remote-tracking branches 'asoc/topic/rl6231' and 'asoc/topic/rt5677' into asoc...

[karo-tx-linux.git] / net / sched / sch_blackhole.c

diff --git a/net/sched/sch_blackhole.c b/net/sched/sch_blackhole.c
index 81f0b8346d17ee3bb790b3dee89012076c35780c..094a874b48bc43ca9337887bdd7cf462ee0ea63f 100644 (file)
--- a/net/sched/sch_blackhole.c
+++ b/net/sched/sch_blackhole.c
@@ -11,11 +11,9 @@
  * Note: Quantum tunneling is not supported.
  */
 
-#include <linux/config.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>
 
@@ -30,11 +28,12 @@ static struct sk_buff *blackhole_dequeue(struct Qdisc *sch)
        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,
+       .peek           = blackhole_dequeue,
        .owner          = THIS_MODULE,
 };