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 /net/core/dev.c | |
| 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 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 6bea8931bb62..44c7de365f55 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3192,9 +3192,9 @@ static inline int __dev_xmit_skb(struct sk_buff *skb, struct Qdisc *q, contended = false; } __qdisc_run(q); - } else - qdisc_run_end(q); + } + qdisc_run_end(q); rc = NET_XMIT_SUCCESS; } else { rc = q->enqueue(skb, q, &to_free) & NET_XMIT_MASK; @@ -3204,6 +3204,7 @@ static inline int __dev_xmit_skb(struct sk_buff *skb, struct Qdisc *q, contended = false; } __qdisc_run(q); + qdisc_run_end(q); } } spin_unlock(root_lock); |