Merge tag 'v3.16-rc1' into i2c/for-next

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

diff --git a/net/sched/sch_fq.c b/net/sched/sch_fq.c
index 23c682b42f99ecb86ca8a103005a52d692a21d38..ba32c2b005d0821788f656e8ae05d4d47a862351 100644 (file)
--- a/net/sched/sch_fq.c
+++ b/net/sched/sch_fq.c
@@ -591,10 +591,7 @@ static void *fq_alloc_node(size_t sz, int node)
 
 static void fq_free(void *addr)
 {
-       if (addr && is_vmalloc_addr(addr))
-               vfree(addr);
-       else
-               kfree(addr);
+       kvfree(addr);
 }
 
 static int fq_resize(struct Qdisc *sch, u32 log)