]> err.no Git - linux-2.6/commitdiff
[NET_SCHED]: sch_hfsc: replace ASSERT macro by WARN_ON
authorPatrick McHardy <kaber@trash.net>
Tue, 13 Feb 2007 20:36:57 +0000 (12:36 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 13 Feb 2007 20:36:57 +0000 (12:36 -0800)
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/sched/sch_hfsc.c

index 135087d4213a45f58eeecd2b935392bb70a933a5..396deb71480f5612250e25cc58cc29f7178c4b1c 100644 (file)
@@ -71,8 +71,6 @@
 #include <asm/system.h>
 #include <asm/div64.h>
 
-#define HFSC_DEBUG 1
-
 /*
  * kernel internal service curve representation:
  *   coordinates are given by 64 bit unsigned integers.
@@ -211,17 +209,6 @@ do {                                                                       \
 } while (0)
 #endif
 
-#if HFSC_DEBUG
-#define ASSERT(cond)                                                   \
-do {                                                                   \
-       if (unlikely(!(cond)))                                          \
-               printk("assertion %s failed at %s:%i (%s)\n",           \
-                      #cond, __FILE__, __LINE__, __FUNCTION__);        \
-} while (0)
-#else
-#define ASSERT(cond)
-#endif /* HFSC_DEBUG */
-
 #define        HT_INFINITY     0xffffffffffffffffULL   /* infinite time value */
 
 
@@ -1492,7 +1479,7 @@ hfsc_schedule_watchdog(struct Qdisc *sch, u64 cur_time)
                if (next_time == 0 || next_time > q->root.cl_cfmin)
                        next_time = q->root.cl_cfmin;
        }
-       ASSERT(next_time != 0);
+       WARN_ON(next_time == 0);
        delay = next_time - cur_time;
        delay = PSCHED_US2JIFFIE(delay);