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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Fri, 7 Apr 2017 08:46:30 -0700
From:   Cong Wang <xiyou.wangcong@...il.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     David Miller <davem@...emloft.net>,
        Networking <netdev@...r.kernel.org>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Jiri Kosina <jkosina@...e.cz>
Subject: Re: linux-next: manual merge of the net-next tree with the net tree

On Thu, Apr 6, 2017 at 5:12 PM, Stephen Rothwell <sfr@...b.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.