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

Commit 61189556 authored by Jacob Keller's avatar Jacob Keller Committed by Jeff Kirsher
Browse files

i40e: use pf data structure directly in i40e_ptp_rx_hang 



There's no reason to pass a *vsi pointer if we already have the *pf
pointer in the only location where we call this function. Lets update
the signature and directly pass the *pf data structure pointer.

Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 2955faca

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

+1 −1
Original line number Diff line number Diff line
@@ -956,7 +956,7 @@ bool i40e_dcb_need_reconfig(struct i40e_pf *pf, 
			    struct i40e_dcbx_config *old_cfg,

			    struct i40e_dcbx_config *new_cfg);

#endif /* CONFIG_I40E_DCB */

void i40e_ptp_rx_hang(struct i40e_vsi *vsi);

void i40e_ptp_rx_hang(struct i40e_pf *pf);

void i40e_ptp_tx_hwtstamp(struct i40e_pf *pf);

void i40e_ptp_rx_hwtstamp(struct i40e_pf *pf, struct sk_buff *skb, u8 index);

void i40e_ptp_set_increment(struct i40e_pf *pf);

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

+1 −1
Original line number Diff line number Diff line
@@ -6372,7 +6372,7 @@ static void i40e_watchdog_subtask(struct i40e_pf *pf) 
				i40e_update_veb_stats(pf->veb[i]);

	}



	i40e_ptp_rx_hang(pf->vsi[pf->lan_vsi]);

	i40e_ptp_rx_hang(pf);

}



/**

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

+2 −2
Original line number Diff line number Diff line
@@ -269,6 +269,7 @@ static u32 i40e_ptp_get_rx_events(struct i40e_pf *pf) 


/**

 * i40e_ptp_rx_hang - Detect error case when Rx timestamp registers are hung

 * @pf: The PF private data structure

 * @vsi: The VSI with the rings relevant to 1588

 *

 * This watchdog task is scheduled to detect error case where hardware has
@@ -276,9 +277,8 @@ static u32 i40e_ptp_get_rx_events(struct i40e_pf *pf) 
 * particular error is rare but leaves the device in a state unable to timestamp

 * any future packets.

 **/

void i40e_ptp_rx_hang(struct i40e_vsi *vsi)

void i40e_ptp_rx_hang(struct i40e_pf *pf)

{

	struct i40e_pf *pf = vsi->back;

	struct i40e_hw *hw = &pf->hw;

	unsigned int i, cleared = 0;