diff options
| author | Patrick McHardy <kaber@trash.net> | 2007-02-13 23:36:57 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2007-02-13 23:36:57 +0300 |
| commit | 3d50f23108ff01457d1ca6fb2b5f2da8214e83e4 (patch) | |
| tree | b5b4c4a4b4be94b16c7975997b8c54682897c235 | |
| parent | a10d567c89dfba90dde2e0515e25760fd74cde06 (diff) | |
| download | linux-3d50f23108ff01457d1ca6fb2b5f2da8214e83e4.tar.xz | |
[NET_SCHED]: sch_hfsc: replace ASSERT macro by WARN_ON
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/sched/sch_hfsc.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/net/sched/sch_hfsc.c b/net/sched/sch_hfsc.c index 135087d4213a..396deb71480f 100644 --- a/net/sched/sch_hfsc.c +++ b/net/sched/sch_hfsc.c @@ -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); |