Re: linux-next: manual merge of the net-next tree with the net tree

From	Cong Wang <xiyou.wangcong@gmail.com>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the net-next tree with the net tree
Date	2017-04-07 17:50 +0200
Message-ID	<ttEj7-G4-17@gated-at.bofh.it> (permalink)
References	<ttpN7-84a-9@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

On Thu, Apr 6, 2017 at 5:12 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> diff --cc net/sched/sch_generic.c
> index 1a2f9e964330,3e64d23e098c..000000000000
> --- a/net/sched/sch_generic.c
> +++ b/net/sched/sch_generic.c
> @@@ -794,8 -794,8 +794,8 @@@ static void attach_default_qdiscs(struc
>                 }
>         }
>   #ifdef CONFIG_NET_SCHED
>  -      if (dev->qdisc)
>  +      if (dev->qdisc != &noop_qdisc)
> -               qdisc_hash_add(dev->qdisc);
> +               qdisc_hash_add(dev->qdisc, false);
>   #endif
>   }


Looks good to me.

Thanks.

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the net-next tree with the net tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-04-07 02:20 +0200
  Re: linux-next: manual merge of the net-next tree with the net tree Cong Wang <xiyou.wangcong@gmail.com> - 2017-04-07 17:50 +0200

csiph-web