From 3bf88d8dd413cd0b8476b137f07466ecd73d2f1a Mon Sep 17 00:00:00 2001 From: Ycarus Date: Wed, 7 Nov 2018 13:52:48 +0100 Subject: [PATCH] sch_netem patch is now applied upstream --- .../linux/generic/hack-4.14/690-mptcp_v0.94.patch | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/root/target/linux/generic/hack-4.14/690-mptcp_v0.94.patch b/root/target/linux/generic/hack-4.14/690-mptcp_v0.94.patch index f1cc7a8b..ba5b222f 100644 --- a/root/target/linux/generic/hack-4.14/690-mptcp_v0.94.patch +++ b/root/target/linux/generic/hack-4.14/690-mptcp_v0.94.patch @@ -20312,18 +20312,3 @@ diff -aurN a/net/mptcp/mptcp_wvegas.c b/net/mptcp/mptcp_wvegas.c +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("MPTCP wVegas"); +MODULE_VERSION("0.1"); -diff --git a/net/sched/sch_netem.c b/net/sched/sch_netem.c -index 2a2ab6bfe5d8..3d325b840802 100644 ---- a/net/sched/sch_netem.c -+++ b/net/sched/sch_netem.c -@@ -624,6 +624,10 @@ static struct sk_buff *netem_dequeue(struct Qdisc *sch) - skb->next = NULL; - skb->prev = NULL; - skb->tstamp = netem_skb_cb(skb)->tstamp_save; -+ /* skb->dev shares skb->rbnode area, -+ * we need to restore its value. -+ */ -+ skb->dev = qdisc_dev(sch); - - #ifdef CONFIG_NET_CLS_ACT - /*