diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-01-12 11:21:24 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-01-12 11:21:24 +0100 |
| commit | 1f1abb67cbfa621d281471fabce6f310879fb4fb (patch) | |
| tree | d9c6629cee38e1b1c8070a0fa78e489555a45424 | |
| parent | c815f920b3a13c8f6f2b016184bbfd30609bc261 (diff) | |
| download | queue-3.18-1f1abb67cbfa621d281471fabce6f310879fb4fb.tar.gz | |
drop broken patch
| -rw-r--r-- | net-sch_prio-when-ungrafting-replace-with-fifo.patch | 48 | ||||
| -rw-r--r-- | series | 1 |
2 files changed, 0 insertions, 49 deletions
diff --git a/net-sch_prio-when-ungrafting-replace-with-fifo.patch b/net-sch_prio-when-ungrafting-replace-with-fifo.patch deleted file mode 100644 index 0a337c4..0000000 --- a/net-sch_prio-when-ungrafting-replace-with-fifo.patch +++ /dev/null @@ -1,48 +0,0 @@ -From foo@baz Sat 11 Jan 2020 09:52:53 AM CET -From: Petr Machata <petrm@mellanox.com> -Date: Mon, 6 Jan 2020 18:01:56 +0000 -Subject: net: sch_prio: When ungrafting, replace with FIFO - -From: Petr Machata <petrm@mellanox.com> - -[ Upstream commit 240ce7f6428ff5188b9eedc066e1e4d645b8635f ] - -When a child Qdisc is removed from one of the PRIO Qdisc's bands, it is -replaced unconditionally by a NOOP qdisc. As a result, any traffic hitting -that band gets dropped. That is incorrect--no Qdisc was explicitly added -when PRIO was created, and after removal, none should have to be added -either. - -Fix PRIO by first attempting to create a default Qdisc and only falling -back to noop when that fails. This pattern of attempting to create an -invisible FIFO, using NOOP only as a fallback, is also seen in other -Qdiscs. - -Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") -Signed-off-by: Petr Machata <petrm@mellanox.com> -Acked-by: Jiri Pirko <jiri@mellanox.com> -Signed-off-by: David S. Miller <davem@davemloft.net> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - net/sched/sch_prio.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - ---- a/net/sched/sch_prio.c -+++ b/net/sched/sch_prio.c -@@ -266,8 +266,14 @@ static int prio_graft(struct Qdisc *sch, - struct prio_sched_data *q = qdisc_priv(sch); - unsigned long band = arg - 1; - -- if (new == NULL) -- new = &noop_qdisc; -+ if (!new) { -+ new = qdisc_create_dflt(sch->dev_queue, &pfifo_qdisc_ops, -+ TC_H_MAKE(sch->handle, arg), extack); -+ if (!new) -+ new = &noop_qdisc; -+ else -+ qdisc_hash_add(new, true); -+ } - - *old = qdisc_replace(sch, new, &q->queues[band]); - return 0; @@ -10,7 +10,6 @@ net-stmmac-dwmac-sunxi-allow-all-rgmii-modes.patch sctp-free-cmd-obj.chunk-for-the-unprocessed-sctp_cmd_reply.patch tcp-fix-old-stuff-d-sack-causing-sack-to-be-treated-as-d-sack.patch vlan-vlan_changelink-should-propagate-errors.patch -net-sch_prio-when-ungrafting-replace-with-fifo.patch vlan-fix-memory-leak-in-vlan_dev_set_egress_priority.patch vxlan-fix-tos-value-before-xmit.patch macvlan-do-not-assume-mac_header-is-set-in-macvlan_broadcast.patch |