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

Commit 33507598 authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Jeff Kirsher
Browse files

i40e/i40evf: remove time_stamp member 



The driver doesn't use the time_stamp member to determine if there is a
tx_hang any more. There really isn't any point to the variable at all
so just remove it. It was left over from a previous tx_hang design.

Change-ID: I4c814827e1bcb46e45118fe37acdcfa814fb62a0
Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: default avatarJim Young <james.m.young@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 3e587cf3

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

+0 −10
Original line number Diff line number Diff line
@@ -165,9 +165,6 @@ int i40e_program_fdir_filter(struct i40e_fdir_filter *fdir_data, u8 *raw_packet, 
	tx_desc->cmd_type_offset_bsz =

		build_ctob(td_cmd, 0, I40E_FDIR_MAX_RAW_PACKET_SIZE, 0);



	/* set the timestamp */

	tx_buf->time_stamp = jiffies;



	/* Force memory writes to complete before letting h/w

	 * know there are new descriptors to fetch.

	 */
@@ -810,10 +807,6 @@ static bool i40e_clean_tx_irq(struct i40e_ring *tx_ring, int budget) 
			 tx_ring->vsi->seid,

			 tx_ring->queue_index,

			 tx_ring->next_to_use, i);

		dev_info(tx_ring->dev, "tx_bi[next_to_clean]\n"

			 "  time_stamp           <%lx>\n"

			 "  jiffies              <%lx>\n",

			 tx_ring->tx_bi[i].time_stamp, jiffies);



		netif_stop_subqueue(tx_ring->netdev, tx_ring->queue_index);
@@ -2606,9 +2599,6 @@ static inline void i40e_tx_map(struct i40e_ring *tx_ring, struct sk_buff *skb, 
						 tx_ring->queue_index),

			     first->bytecount);



	/* set the timestamp */

	first->time_stamp = jiffies;



	/* Force memory writes to complete before letting h/w

	 * know there are new descriptors to fetch.  (Only

	 * applicable for weak-ordered memory model archs,

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

+0 −1
Original line number Diff line number Diff line
@@ -147,7 +147,6 @@ enum i40e_dyn_idx_t { 


struct i40e_tx_buffer {

	struct i40e_tx_desc *next_to_watch;

	unsigned long time_stamp;

	union {

		struct sk_buff *skb;

		void *raw_buf;

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

+0 −7
Original line number Diff line number Diff line
@@ -322,10 +322,6 @@ static bool i40e_clean_tx_irq(struct i40e_ring *tx_ring, int budget) 
			 tx_ring->vsi->seid,

			 tx_ring->queue_index,

			 tx_ring->next_to_use, i);

		dev_info(tx_ring->dev, "tx_bi[next_to_clean]\n"

			 "  time_stamp           <%lx>\n"

			 "  jiffies              <%lx>\n",

			 tx_ring->tx_bi[i].time_stamp, jiffies);



		netif_stop_subqueue(tx_ring->netdev, tx_ring->queue_index);
@@ -1824,9 +1820,6 @@ static inline void i40evf_tx_map(struct i40e_ring *tx_ring, struct sk_buff *skb, 
						 tx_ring->queue_index),

			     first->bytecount);



	/* set the timestamp */

	first->time_stamp = jiffies;



	/* Force memory writes to complete before letting h/w

	 * know there are new descriptors to fetch.  (Only

	 * applicable for weak-ordered memory model archs,

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

+0 −1
Original line number Diff line number Diff line
@@ -146,7 +146,6 @@ enum i40e_dyn_idx_t { 


struct i40e_tx_buffer {

	struct i40e_tx_desc *next_to_watch;

	unsigned long time_stamp;

	union {

		struct sk_buff *skb;

		void *raw_buf;