aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel
diff options
context:
space:
mode:
authorCarolyn Wyborny <carolyn.wyborny@intel.com>2015-01-24 04:58:32 -0500
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2015-02-09 04:50:36 -0500
commit638702bd59a336f48f39a58ed8bdf199c08afeda (patch)
tree289a7fa20129968a15e74b798ed8415c6aee32a3 /drivers/net/ethernet/intel
parent9230165f00ddfeb17094bbfe1b0665521c1856d2 (diff)
i40e/i40evf: Add call to u64_stats_init to init
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>
Diffstat (limited to 'drivers/net/ethernet/intel')
-rw-r--r--drivers/net/ethernet/intel/i40e/i40e_txrx.c2
-rw-r--r--drivers/net/ethernet/intel/i40evf/i40e_txrx.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
index 5aa6ef15f241..f4d6d90572d1 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)
1098 if (!rx_ring->rx_bi) 1098 if (!rx_ring->rx_bi)
1099 goto err; 1099 goto err;
1100 1100
1101 u64_stats_init(rx_ring->syncp);
1102
1101 /* Round up to nearest 4K */ 1103 /* Round up to nearest 4K */
1102 rx_ring->size = ring_is_16byte_desc_enabled(rx_ring) 1104 rx_ring->size = ring_is_16byte_desc_enabled(rx_ring)
1103 ? rx_ring->count * sizeof(union i40e_16byte_rx_desc) 1105 ? 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 4bf15da509e3..459499a47ca3 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)
596 if (!rx_ring->rx_bi) 596 if (!rx_ring->rx_bi)
597 goto err; 597 goto err;
598 598
599 u64_stats_init(rx_ring->syncp);
600
599 /* Round up to nearest 4K */ 601 /* Round up to nearest 4K */
600 rx_ring->size = ring_is_16byte_desc_enabled(rx_ring) 602 rx_ring->size = ring_is_16byte_desc_enabled(rx_ring)
601 ? rx_ring->count * sizeof(union i40e_16byte_rx_desc) 603 ? rx_ring->count * sizeof(union i40e_16byte_rx_desc)