Merge tag 'v3.16-rc5' into timers/core

[sfrench/cifs-2.6.git] / net / sched / sch_netem.c

diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c
index f1669a00f5710c297310f4a1da4a1b4e72cd3cab..111d70fddaea97242ac4a85115e969efcd11dfcd 100644 (file)
--- a/net/sched/sch_netem.c
+++ b/net/sched/sch_netem.c
@@ -648,12 +648,7 @@ static void netem_reset(struct Qdisc *sch)
 
 static void dist_free(struct disttable *d)
 {
-       if (d) {
-               if (is_vmalloc_addr(d))
-                       vfree(d);
-               else
-                       kfree(d);
-       }
+       kvfree(d);
 }
 
 /*