diff options
| author |   John Fastabend <john.fastabend@gmail.com> | 2017-12-07 09:54:06 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-12-08 13:32:25 -0500 |
| commit | 6c148184b5c868ad2c8a5a4a777cd8097622368a (patch) | |
| tree | 20df668b5d8b68c11937e4c0fd6303b26b73cf6c /include/net/pkt_sched.h | |
| parent | virtio_net: Disable interrupts if napi_complete_done rescheduled napi (diff) | |
| download | linux-dev-6c148184b5c868ad2c8a5a4a777cd8097622368a.tar.xz linux-dev-6c148184b5c868ad2c8a5a4a777cd8097622368a.zip | |
net: sched: cleanup qdisc_run and __qdisc_run semantics
Currently __qdisc_run calls qdisc_run_end() but does not call
qdisc_run_begin(). This makes it hard to track pairs of
qdisc_run_{begin,end} across function calls.
To simplify reading these code paths this patch moves begin/end calls
into qdisc_run().
Signed-off-by: John Fastabend <john.fastabend@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/pkt_sched.h')
| -rw-r--r-- | include/net/pkt_sched.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h index d1f413f06c72..4eea7198898e 100644 --- a/include/net/pkt_sched.h +++ b/include/net/pkt_sched.h @@ -113,8 +113,10 @@ void __qdisc_run(struct Qdisc *q); static inline void qdisc_run(struct Qdisc *q) { - if (qdisc_run_begin(q)) + if (qdisc_run_begin(q)) { __qdisc_run(q); + qdisc_run_end(q); + } } static inline __be16 tc_skb_protocol(const struct sk_buff *skb) |