Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4668607a authored by Mitch Williams's avatar Mitch Williams Committed by Jeff Kirsher
Browse files

i40e: properly show packet split status in debugfs 



Get rid of the unused hsplit field in the ring struct and use the
existing macro to detect packet split enablement. This allows debugfs
dumps of the VSI to properly show which Rx routine is in use.

Change-ID: Ic4e9589e6a788ab196ed0850703f704e30c03781
Signed-off-by: default avatarMitch Williams <mitch.a.williams@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 1a36d7fa

drivers/net/ethernet/intel/i40e/i40e_debugfs.c

+3 −3
Original line number Diff line number Diff line
@@ -521,7 +521,7 @@ static void i40e_dbg_dump_vsi_seid(struct i40e_pf *pf, int seid) 
			 rx_ring->dtype);

		dev_info(&pf->pdev->dev,

			 "    rx_rings[%i]: hsplit = %d, next_to_use = %d, next_to_clean = %d, ring_active = %i\n",

			 i, rx_ring->hsplit,

			 i, ring_is_ps_enabled(rx_ring),

			 rx_ring->next_to_use,

			 rx_ring->next_to_clean,

			 rx_ring->ring_active);
@@ -572,8 +572,8 @@ static void i40e_dbg_dump_vsi_seid(struct i40e_pf *pf, int seid) 
			 "    tx_rings[%i]: dtype = %d\n",

			 i, tx_ring->dtype);

		dev_info(&pf->pdev->dev,

			 "    tx_rings[%i]: hsplit = %d, next_to_use = %d, next_to_clean = %d, ring_active = %i\n",

			 i, tx_ring->hsplit,

			 "    tx_rings[%i]: next_to_use = %d, next_to_clean = %d, ring_active = %i\n",

			 i,

			 tx_ring->next_to_use,

			 tx_ring->next_to_clean,

			 tx_ring->ring_active);

drivers/net/ethernet/intel/i40e/i40e_txrx.h

+0 −1
Original line number Diff line number Diff line
@@ -256,7 +256,6 @@ struct i40e_ring { 
#define I40E_RX_DTYPE_NO_SPLIT      0

#define I40E_RX_DTYPE_HEADER_SPLIT  1

#define I40E_RX_DTYPE_SPLIT_ALWAYS  2

	u8  hsplit;

#define I40E_RX_SPLIT_L2      0x1

#define I40E_RX_SPLIT_IP      0x2

#define I40E_RX_SPLIT_TCP_UDP 0x4

drivers/net/ethernet/intel/i40evf/i40e_txrx.h

+0 −1
Original line number Diff line number Diff line
@@ -255,7 +255,6 @@ struct i40e_ring { 
#define I40E_RX_DTYPE_NO_SPLIT      0

#define I40E_RX_DTYPE_HEADER_SPLIT  1

#define I40E_RX_DTYPE_SPLIT_ALWAYS  2

	u8  hsplit;

#define I40E_RX_SPLIT_L2      0x1

#define I40E_RX_SPLIT_IP      0x2

#define I40E_RX_SPLIT_TCP_UDP 0x4