mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 23:27:06 +00:00
[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>
This commit is contained in:
parent
a10d567c89
commit
3d50f23108
1 changed files with 1 additions and 14 deletions
|
@ -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 { \
|
||||||
} 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)
|
||||||
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);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue