From: Christoph Paasch <cpaa...@apple.com> Date: Thu, 18 Oct 2018 13:38:40 -0700
> Upstream commit bffa72cf7f9d ("net: sk_buff rbnode reorg") got > backported as commit 6b921536f170 ("net: sk_buff rbnode reorg") into the > v4.14.x-tree. > > However, the backport does not include the changes in sch_netem.c > > We need these, as otherwise the skb->dev pointer is not set when > dequeueing from the netem rbtree, resulting in a panic: ... > Fixes: 6b921536f170 ("net: sk_buff rbnode reorg") > Cc: Stephen Hemminger <step...@networkplumber.org> > Cc: Eric Dumazet <eduma...@google.com> > Cc: Soheil Hassas Yeganeh <soh...@google.com> > Cc: Wei Wang <wei...@google.com> > Cc: Willem de Bruijn <will...@google.com> > Signed-off-by: Christoph Paasch <cpaa...@apple.com> > --- > > Notes: > This patch should only make it into v4.14-stable as that's the only > branch where > the offending commit has been backported to. Greg, please queue up.