From: Sergei Shtylyov <sergei.shtylyov@cogentembedded•com>
To: Jeff Kirsher <jeffrey.t.kirsher@intel•com>, davem@davemloft•net
Cc: Carolyn Wyborny <carolyn.wyborny@intel•com>,
netdev@vger•kernel.org, nhorman@redhat•com, sassmann@redhat•com,
jogreene@redhat•com
Subject: Re: [net-next 15/15] i40e/i40evf: Add call to u64_stats_init to init
Date: Mon, 09 Feb 2015 15:09:15 +0300 [thread overview]
Message-ID: <54D8A36B.8040401@cogentembedded.com> (raw)
In-Reply-To: <1423478641-3138-16-git-send-email-jeffrey.t.kirsher@intel.com>
Hello.
On 2/9/2015 1:44 PM, Jeff Kirsher wrote:
> From: Carolyn Wyborny <carolyn.wyborny@intel•com>
> This patch adds a call to u64_stats_init to Rx setup.
> This done in order to avoid lockdep errors with seqcount on newer kernels.
> Change-ID: Ia8ba8f0bcbd1c0e926f97d70aeee4ce4fd055e93
> Signed-off-by: Carolyn Wyborny <carolyn.wyborny@intel•com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel•com>
> ---
> drivers/net/ethernet/intel/i40e/i40e_txrx.c | 2 ++
> drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 2 ++
> 2 files changed, 4 insertions(+)
> diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
> index 5aa6ef1..f4d6d90 100644
> --- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
> +++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
> @@ -1098,6 +1098,8 @@ int i40e_setup_rx_descriptors(struct i40e_ring *rx_ring)
> if (!rx_ring->rx_bi)
> goto err;
>
> + u64_stats_init(rx_ring->syncp);
This is over-indented.
> +
> /* Round up to nearest 4K */
> rx_ring->size = ring_is_16byte_desc_enabled(rx_ring)
> ? rx_ring->count * sizeof(union i40e_16byte_rx_desc)
> diff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
> index 4bf15da..459499a 100644
> --- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
> +++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
> @@ -596,6 +596,8 @@ int i40evf_setup_rx_descriptors(struct i40e_ring *rx_ring)
> if (!rx_ring->rx_bi)
> goto err;
>
> + u64_stats_init(rx_ring->syncp);
Likewise.
> +
> /* Round up to nearest 4K */
> rx_ring->size = ring_is_16byte_desc_enabled(rx_ring)
> ? rx_ring->count * sizeof(union i40e_16byte_rx_desc)
WBR, Sergei
next prev parent reply other threads:[~2015-02-09 12:09 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-09 10:43 [net-next 00/15][pull request] Intel Wired LAN Driver Updates 2015-02-09 Jeff Kirsher
2015-02-09 10:43 ` [net-next 01/15] i40e: i40e_fcoe.c: Remove unused function Jeff Kirsher
2015-02-09 10:43 ` [net-next 02/15] i40e: avoid use of uninitialized v_budget in i40e_init_msix Jeff Kirsher
2015-02-09 10:43 ` [net-next 03/15] i40e: delay after VF reset Jeff Kirsher
2015-02-09 10:43 ` [net-next 04/15] i40e: Use even more ARQ descriptors Jeff Kirsher
2015-02-09 10:43 ` [net-next 05/15] i40e: add locking around VF reset Jeff Kirsher
2015-02-09 10:43 ` [net-next 06/15] i40evf: reset on module unload Jeff Kirsher
2015-02-09 10:43 ` [net-next 07/15] i40evf: ignore bogus messages from FW Jeff Kirsher
2015-02-09 10:43 ` [net-next 08/15] i40evf: stop the watchdog for shutdown Jeff Kirsher
2015-02-09 10:43 ` [net-next 09/15] i40e: stop the service task at shutdown Jeff Kirsher
2015-02-09 10:43 ` [net-next 10/15] i40evf: Force Tx writeback on ITR Jeff Kirsher
2015-02-09 10:43 ` [net-next 11/15] i40e: fix led blink toggle to enable steady state Jeff Kirsher
2015-02-09 10:43 ` [net-next 12/15] i40e: Fix function header Jeff Kirsher
2015-02-09 10:43 ` [net-next 13/15] i40e: use dev_port for fcoe netdev Jeff Kirsher
2015-02-09 10:44 ` [net-next 14/15] i40e: Enable Loopback for the FCOE vsi as well Jeff Kirsher
2015-02-09 10:44 ` [net-next 15/15] i40e/i40evf: Add call to u64_stats_init to init Jeff Kirsher
2015-02-09 12:09 ` Sergei Shtylyov [this message]
2015-02-09 16:45 ` Wyborny, Carolyn
2015-02-09 22:18 ` [net-next 00/15][pull request] Intel Wired LAN Driver Updates 2015-02-09 David Miller
2015-02-10 0:25 ` Jeff Kirsher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=54D8A36B.8040401@cogentembedded.com \
--to=sergei.shtylyov@cogentembedded$(echo .)com \
--cc=carolyn.wyborny@intel$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=jeffrey.t.kirsher@intel$(echo .)com \
--cc=jogreene@redhat$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=nhorman@redhat$(echo .)com \
--cc=sassmann@redhat$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox