Commit 3d50f231 authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller

[NET_SCHED]: sch_hfsc: replace ASSERT macro by WARN_ON

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a10d567c
...@@ -71,8 +71,6 @@ ...@@ -71,8 +71,6 @@
#include <asm/system.h> #include <asm/system.h>
#include <asm/div64.h> #include <asm/div64.h>
#define HFSC_DEBUG 1
/* /*
* kernel internal service curve representation: * kernel internal service curve representation:
* coordinates are given by 64 bit unsigned integers. * coordinates are given by 64 bit unsigned integers.
...@@ -211,17 +209,6 @@ do { \ ...@@ -211,17 +209,6 @@ do { \
} while (0) } while (0)
#endif #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 */ #define HT_INFINITY 0xffffffffffffffffULL /* infinite time value */
...@@ -1492,7 +1479,7 @@ hfsc_schedule_watchdog(struct Qdisc *sch, u64 cur_time) ...@@ -1492,7 +1479,7 @@ hfsc_schedule_watchdog(struct Qdisc *sch, u64 cur_time)
if (next_time == 0 || next_time > q->root.cl_cfmin) if (next_time == 0 || next_time > q->root.cl_cfmin)
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 = next_time - cur_time;
delay = PSCHED_US2JIFFIE(delay); delay = PSCHED_US2JIFFIE(delay);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment