diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2016-05-26 17:21:06 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-05-31 11:44:08 -0700 |
| commit | bcf91bdb44d2e6d84ffc5b7ab0400d5ff1c27645 (patch) | |
| tree | fd118890fd488cb1118c061c1ae0f7f56c8a67f8 | |
| parent | c08376ac97cb202ec65320f3d90d5c4c5e2adb0b (diff) | |
| download | linux-stable-bcf91bdb44d2e6d84ffc5b7ab0400d5ff1c27645.tar.gz linux-stable-bcf91bdb44d2e6d84ffc5b7ab0400d5ff1c27645.tar.bz2 linux-stable-bcf91bdb44d2e6d84ffc5b7ab0400d5ff1c27645.zip | |
net: pktgen: Call destroy_hrtimer_on_stack()
If CONFIG_DEBUG_OBJECTS_TIMERS=y, hrtimer_init_on_stack() requires
a matching call to destroy_hrtimer_on_stack() to clean up timer
debug objects.
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/core/pktgen.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/core/pktgen.c b/net/core/pktgen.c index 8604ae245960..8b02df0d354d 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c @@ -2245,10 +2245,8 @@ static void spin(struct pktgen_dev *pkt_dev, ktime_t spin_until) hrtimer_set_expires(&t.timer, spin_until); remaining = ktime_to_ns(hrtimer_expires_remaining(&t.timer)); - if (remaining <= 0) { - pkt_dev->next_tx = ktime_add_ns(spin_until, pkt_dev->delay); - return; - } + if (remaining <= 0) + goto out; start_time = ktime_get(); if (remaining < 100000) { @@ -2273,7 +2271,9 @@ static void spin(struct pktgen_dev *pkt_dev, ktime_t spin_until) } pkt_dev->idle_acc += ktime_to_ns(ktime_sub(end_time, start_time)); +out: pkt_dev->next_tx = ktime_add_ns(spin_until, pkt_dev->delay); + destroy_hrtimer_on_stack(&t.timer); } static inline void set_pkt_overhead(struct pktgen_dev *pkt_dev) |