[RHEL7,COMMIT] net: drop redundant WARN in qdisc_restart()

Submitted by Konstantin Khorenko on Dec. 18, 2017, 2:38 p.m.


Message ID 201712181438.vBIEcBdr014070@finist_ce7.work
State New
Series "net: drop redundant WARN in qdisc_restart()"
Headers show

Commit Message

Konstantin Khorenko Dec. 18, 2017, 2:38 p.m.
The commit is pushed to "branch-rh7-3.10.0-693.11.1.vz7.39.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-693.11.1.vz7.39.7
commit ce0e123868f6f0716ae00b24cc8cef4a606ea51a
Author: Konstantin Khorenko <khorenko@virtuozzo.com>
Date:   Mon Dec 18 17:38:11 2017 +0300

    net: drop redundant WARN in qdisc_restart()
    +       WARN_ON_ONCE(skb_dst_is_noref(skb));
    came to 3.10.0-x on a rebase from 2.6.32-x,
    in ms it has been removed by commit:
      0287587884b1 ("net: better IFF_XMIT_DST_RELEASE support")
    and the commit presents in current RHEL7 kernel =>
    this WARN is a leftover => drop it.
    Signed-off-by: Konstantin Khorenko <khorenko@virtuozzo.com>
 net/sched/sch_generic.c | 1 -
 1 file changed, 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 26820a75c8b7..dc5491b17e09 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -223,7 +223,6 @@  static inline int qdisc_restart(struct Qdisc *q)
 	if (unlikely(!skb))
 		return 0;
-	WARN_ON_ONCE(skb_dst_is_noref(skb));
 	root_lock = qdisc_lock(q);
 	dev = qdisc_dev(q);
 	txq = skb_get_tx_queue(dev, skb);