summaryrefslogtreecommitdiff
path: root/net/sched
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2024-06-13 23:13:38 +0300
committerJakub Kicinski <kuba@kernel.org>2024-06-13 23:13:46 +0300
commit4c7d3d79c736186bb2585f2d0a8231e1fac839da (patch)
tree5abd973d57d360e24c9df2f17e942176ab2faaa5 /net/sched
parent3ec8d7572a69d142d49f52b28ce8d84e5fef9131 (diff)
parentd20f6b3d747c36889b7ce75ee369182af3decb6b (diff)
downloadlinux-4c7d3d79c736186bb2585f2d0a8231e1fac839da.tar.xz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR. No conflicts, no adjacent changes. Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/sched')
-rw-r--r--net/sched/sch_generic.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
index 1417f1991452..2af24547a82c 100644
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -677,6 +677,7 @@ struct Qdisc noop_qdisc = {
.qlen = 0,
.lock = __SPIN_LOCK_UNLOCKED(noop_qdisc.skb_bad_txq.lock),
},
+ .owner = -1,
};
EXPORT_SYMBOL(noop_qdisc);