drop broken 4.4 patch

diff --git a/queue-4.4/net_sched-remove-warning-from-qdisc_hash_add.patch b/queue-4.4/net_sched-remove-warning-from-qdisc_hash_add.patch
deleted file mode 100644 (file)
index 9bffc61..0000000
--- a/queue-4.4/net_sched-remove-warning-from-qdisc_hash_add.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From foo@baz Thu Aug 24 17:48:38 PDT 2017
-From: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
-Date: Tue, 15 Aug 2017 16:39:05 +0300
-Subject: net_sched: remove warning from qdisc_hash_add
-
-From: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
-
-
-[ Upstream commit c90e95147c27b1780e76c6e8fea1b5c78d7d387f ]
-
-It was added in commit e57a784d8cae ("pkt_sched: set root qdisc
-before change() in attach_default_qdiscs()") to hide duplicates
-from "tc qdisc show" for incative deivices.
-
-After 59cc1f61f ("net: sched: convert qdisc linked list to hashtable")
-it triggered when classful qdisc is added to inactive device because
-default qdiscs are added before switching root qdisc.
-
-Anyway after commit ea3274695353 ("net: sched: avoid duplicates in
-qdisc dump") duplicates are filtered right in dumper.
-
-Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- net/sched/sch_api.c |    3 ---
- 1 file changed, 3 deletions(-)
-
---- a/net/sched/sch_api.c
-+++ b/net/sched/sch_api.c
-@@ -275,9 +275,6 @@ static struct Qdisc *qdisc_match_from_ro
- void qdisc_list_add(struct Qdisc *q)
- {
-       if ((q->parent != TC_H_ROOT) && !(q->flags & TCQ_F_INGRESS)) {
--              struct Qdisc *root = qdisc_dev(q)->qdisc;
--
--              WARN_ON_ONCE(root == &noop_qdisc);
-               ASSERT_RTNL();
-               list_add_tail_rcu(&q->list, &root->list);
-       }

diff --git a/queue-4.4/series b/queue-4.4/series
index d6afd994d7158b50c0113f4d258915ac62c83dd6..75a52e6f878172dcece632d2569d19ee549aca3f 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -3,7 +3,6 @@ dccp-purge-write-queue-in-dccp_destroy_sock.patch
 dccp-defer-ccid_hc_tx_delete-at-dismantle-time.patch
 ipv4-fix-null-dereference-in-free_fib_info_rcu.patch
 net_sched-sfq-update-hierarchical-backlog-when-drop-packet.patch
-net_sched-remove-warning-from-qdisc_hash_add.patch
 ipv4-better-ip_max_mtu-enforcement.patch
 sctp-fully-initialize-the-ipv6-address-in-sctp_v6_to_addr.patch
 tipc-fix-use-after-free.patch