netdev - 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]

Message-ID: <20220428112928.0f87bfb6@canb.auug.org.au>
Date:   Thu, 28 Apr 2022 11:29:28 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     David Miller <davem@...emloft.net>,
        Networking <netdev@...r.kernel.org>
Cc:     Jakub Kicinski <kuba@...nel.org>,
        Jeffrey Ji <jeffreyji@...gle.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Sebastian Andrzej Siewior <bigeasy@...utronix.de>
Subject: Re: linux-next: manual merge of the net-next tree with the net tree

Hi all,

On Thu, 28 Apr 2022 11:19:03 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> diff --cc net/core/dev.c
> index 1461c2d9dec8,611bd7197064..000000000000
> --- a/net/core/dev.c
> +++ b/net/core/dev.c
> @@@ -10352,9 -10409,10 +10405,10 @@@ struct rtnl_link_stats64 *dev_get_stats
>   
>   		for_each_possible_cpu(i) {
>   			core_stats = per_cpu_ptr(p, i);
>  -			storage->rx_dropped += local_read(&core_stats->rx_dropped);
>  -			storage->tx_dropped += local_read(&core_stats->tx_dropped);
>  -			storage->rx_nohandler += local_read(&core_stats->rx_nohandler);
>  -			storage->rx_otherhost_dropped += local_read(&core_stats->rx_otherhost_dropped);
>  +			storage->rx_dropped += READ_ONCE(core_stats->rx_dropped);
>  +			storage->tx_dropped += READ_ONCE(core_stats->tx_dropped);
>  +			storage->rx_nohandler += READ_ONCE(core_stats->rx_nohandler);
> ++			storage->rx_otherhost_dropped += READ_ONCE(&core_stats->rx_otherhost_dropped);
                                                                   ^
I failed to remove the '&'.  I have done that now to fix up my merge
resolution.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped