Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[mirror_ubuntu-artful-kernel.git] / net / sched / sch_multiq.c

diff --git a/net/sched/sch_multiq.c b/net/sched/sch_multiq.c
index c50876cd87047bace522be68375d193687108ade..6ae251279fc2f53c86aa339d39bff13b71c79991 100644 (file)
--- a/net/sched/sch_multiq.c
+++ b/net/sched/sch_multiq.c
@@ -340,7 +340,6 @@ static unsigned long multiq_bind(struct Qdisc *sch, unsigned long parent,
 
 static void multiq_put(struct Qdisc *q, unsigned long cl)
 {
-       return;
 }
 
 static int multiq_dump_class(struct Qdisc *sch, unsigned long cl,