i40e/i40evf: Remove reference to ring->dtype

As part of the rx-refactor, the dtype variable in the i40e_ring
struct is no longer used, so remove it.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c
index f119a747f5d91721ee087c655aad2697cdc0473d..c0a01e0eb1818f7c13a6f1182c6e87d9e55249cc 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_debugfs.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_debugfs.c
@@ -268,10 +268,9 @@ static void i40e_dbg_dump_vsi_seid(struct i40e_pf *pf, int seid)
                         rx_ring->queue_index,
                         rx_ring->reg_idx);
                dev_info(&pf->pdev->dev,
-                        "    rx_rings[%i]: rx_hdr_len = %d, rx_buf_len = %d, dtype = %d\n",
+                        "    rx_rings[%i]: rx_hdr_len = %d, rx_buf_len = %d\n",
                         i, rx_ring->rx_hdr_len,
-                        rx_ring->rx_buf_len,
-                        rx_ring->dtype);
+                        rx_ring->rx_buf_len);
                dev_info(&pf->pdev->dev,
                         "    rx_rings[%i]: next_to_use = %d, next_to_clean = %d, ring_active = %i\n",
                         i,
@@ -325,9 +324,6 @@ static void i40e_dbg_dump_vsi_seid(struct i40e_pf *pf, int seid)
                         i, tx_ring->state,
                         tx_ring->queue_index,
                         tx_ring->reg_idx);
-               dev_info(&pf->pdev->dev,
-                        "    tx_rings[%i]: dtype = %d\n",
-                        i, tx_ring->dtype);
                dev_info(&pf->pdev->dev,
                         "    tx_rings[%i]: next_to_use = %d, next_to_clean = %d, ring_active = %i\n",
                         i,

diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.h b/drivers/net/ethernet/intel/i40e/i40e_txrx.h
index 5a2d0fef4d37075ed55a55b880001a021955d94b..03e21d95c4f1351098b619b2bc24a4d39c7d5926 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.h
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.h
@@ -282,7 +282,6 @@ struct i40e_ring {
        u16 reg_idx;                    /* HW register index of the ring */
        u16 rx_hdr_len;
        u16 rx_buf_len;
-       u8  dtype;
 #define I40E_RX_DTYPE_NO_SPLIT      0
 #define I40E_RX_DTYPE_HEADER_SPLIT  1
 #define I40E_RX_DTYPE_SPLIT_ALWAYS  2

diff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.h b/drivers/net/ethernet/intel/i40evf/i40e_txrx.h
index 54b52e8f7097bbe5b6c50bffdd761f026e970127..3b3f9764c2352c018979832783dbb6c701af9caf 100644 (file)
--- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.h
+++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.h
@@ -280,7 +280,6 @@ struct i40e_ring {
        u16 reg_idx;                    /* HW register index of the ring */
        u16 rx_hdr_len;
        u16 rx_buf_len;
-       u8  dtype;
 #define I40E_RX_DTYPE_NO_SPLIT      0
 #define I40E_RX_DTYPE_HEADER_SPLIT  1
 #define I40E_RX_DTYPE_SPLIT_ALWAYS  2