From: David S. Miller Date: Wed, 8 Jan 2020 20:45:53 +0000 (-0800) Subject: Merge branch 'net-ungraft-prio' X-Git-Tag: baikal/mips/sdk5.9~14596^2~5 X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=4e1cf569c7ac2e132c0ed689e1843565dff57076;p=kernel.git Merge branch 'net-ungraft-prio' Petr Machata says: ==================== When ungrafting from PRIO, replace child with FIFO 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. In patch #2, this problem is fixed for 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 some other Qdiscs. The only driver currently offloading PRIO (and thus presumably the only one impacted by this) is mlxsw. Therefore patch #1 extends mlxsw to handle the replacement by an invisible FIFO gracefully. ==================== Signed-off-by: David S. Miller --- 4e1cf569c7ac2e132c0ed689e1843565dff57076