Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6

[linux-drm-fsl-dcu.git] / net / sched / sch_mq.c

diff --git a/net/sched/sch_mq.c b/net/sched/sch_mq.c
index b2aba3f5e6fa5cd8bdf127c86d96fd7ab21ebf32..fe91e50f9d98e7f2819242fc5a3b68ff905219a2 100644 (file)
--- a/net/sched/sch_mq.c
+++ b/net/sched/sch_mq.c
@@ -174,7 +174,6 @@ static unsigned long mq_get(struct Qdisc *sch, u32 classid)
 
 static void mq_put(struct Qdisc *sch, unsigned long cl)
 {
-       return;
 }
 
 static int mq_dump_class(struct Qdisc *sch, unsigned long cl,