Commit 45f5478c authored by Jan Sokolowski's avatar Jan Sokolowski Committed by Tony Nguyen
Browse files

ice: refactor ice_lib to make functions static 



As following methods are not used outside of ice_lib,
they can be made static:
ice_vsi_is_vlan_pruning_ena
ice_vsi_cfg_frame_size

Signed-off-by: default avatarJan Sokolowski <jan.sokolowski@intel.com>
Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Reviewed-by: default avatarPrzemek Kitszel <przemyslaw.kitszel@intel.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 708b352f

drivers/net/ethernet/intel/ice/ice_lib.c

+35 −35
Original line number Diff line number Diff line
@@ -1227,6 +1227,20 @@ ice_chnl_vsi_setup_q_map(struct ice_vsi *vsi, struct ice_vsi_ctx *ctxt) 
	ctxt->info.q_mapping[1] = cpu_to_le16(qcount);

}



/**

 * ice_vsi_is_vlan_pruning_ena - check if VLAN pruning is enabled or not

 * @vsi: VSI to check whether or not VLAN pruning is enabled.

 *

 * returns true if Rx VLAN pruning is enabled and false otherwise.

 */

static bool ice_vsi_is_vlan_pruning_ena(struct ice_vsi *vsi)

{

	if (!vsi)

		return false;



	return (vsi->info.sw_flags2 & ICE_AQ_VSI_SW_FLAG_RX_VLAN_PRUNE_ENA);

}



/**

 * ice_vsi_init - Create and initialize a VSI

 * @vsi: the VSI being configured
@@ -1684,6 +1698,27 @@ static void ice_vsi_set_rss_flow_fld(struct ice_vsi *vsi) 
			vsi_num, status);

}



/**

 * ice_vsi_cfg_frame_size - setup max frame size and Rx buffer length

 * @vsi: VSI

 */

static void ice_vsi_cfg_frame_size(struct ice_vsi *vsi)

{

	if (!vsi->netdev || test_bit(ICE_FLAG_LEGACY_RX, vsi->back->flags)) {

		vsi->max_frame = ICE_MAX_FRAME_LEGACY_RX;

		vsi->rx_buf_len = ICE_RXBUF_1664;

#if (PAGE_SIZE < 8192)

	} else if (!ICE_2K_TOO_SMALL_WITH_PADDING &&

		   (vsi->netdev->mtu <= ETH_DATA_LEN)) {

		vsi->max_frame = ICE_RXBUF_1536 - NET_IP_ALIGN;

		vsi->rx_buf_len = ICE_RXBUF_1536 - NET_IP_ALIGN;

#endif

	} else {

		vsi->max_frame = ICE_AQ_SET_MAC_FRAME_SIZE_MAX;

		vsi->rx_buf_len = ICE_RXBUF_3072;

	}

}



/**

 * ice_pf_state_is_nominal - checks the PF for nominal state

 * @pf: pointer to PF to check
@@ -1758,27 +1793,6 @@ void ice_update_eth_stats(struct ice_vsi *vsi) 
	vsi->stat_offsets_loaded = true;

}



/**

 * ice_vsi_cfg_frame_size - setup max frame size and Rx buffer length

 * @vsi: VSI

 */

void ice_vsi_cfg_frame_size(struct ice_vsi *vsi)

{

	if (!vsi->netdev || test_bit(ICE_FLAG_LEGACY_RX, vsi->back->flags)) {

		vsi->max_frame = ICE_MAX_FRAME_LEGACY_RX;

		vsi->rx_buf_len = ICE_RXBUF_1664;

#if (PAGE_SIZE < 8192)

	} else if (!ICE_2K_TOO_SMALL_WITH_PADDING &&

		   (vsi->netdev->mtu <= ETH_DATA_LEN)) {

		vsi->max_frame = ICE_RXBUF_1536 - NET_IP_ALIGN;

		vsi->rx_buf_len = ICE_RXBUF_1536 - NET_IP_ALIGN;

#endif

	} else {

		vsi->max_frame = ICE_AQ_SET_MAC_FRAME_SIZE_MAX;

		vsi->rx_buf_len = ICE_RXBUF_3072;

	}

}



/**

 * ice_write_qrxflxp_cntxt - write/configure QRXFLXP_CNTXT register

 * @hw: HW pointer
@@ -2185,20 +2199,6 @@ bool ice_vsi_is_rx_queue_active(struct ice_vsi *vsi) 
	return false;

}



/**

 * ice_vsi_is_vlan_pruning_ena - check if VLAN pruning is enabled or not

 * @vsi: VSI to check whether or not VLAN pruning is enabled.

 *

 * returns true if Rx VLAN pruning is enabled and false otherwise.

 */

bool ice_vsi_is_vlan_pruning_ena(struct ice_vsi *vsi)

{

	if (!vsi)

		return false;



	return (vsi->info.sw_flags2 & ICE_AQ_VSI_SW_FLAG_RX_VLAN_PRUNE_ENA);

}



static void ice_vsi_set_tc_cfg(struct ice_vsi *vsi)

{

	if (!test_bit(ICE_FLAG_DCB_ENA, vsi->back->flags)) {

drivers/net/ethernet/intel/ice/ice_lib.h

+0 −3
Original line number Diff line number Diff line
@@ -76,8 +76,6 @@ int ice_vsi_cfg_xdp_txqs(struct ice_vsi *vsi); 


int ice_vsi_stop_xdp_tx_rings(struct ice_vsi *vsi);



bool ice_vsi_is_vlan_pruning_ena(struct ice_vsi *vsi);



void ice_cfg_sw_lldp(struct ice_vsi *vsi, bool tx, bool create);



int ice_set_link(struct ice_vsi *vsi, bool ena);
@@ -128,7 +126,6 @@ void ice_update_tx_ring_stats(struct ice_tx_ring *ring, u64 pkts, u64 bytes); 


void ice_update_rx_ring_stats(struct ice_rx_ring *ring, u64 pkts, u64 bytes);



void ice_vsi_cfg_frame_size(struct ice_vsi *vsi);

void ice_write_intrl(struct ice_q_vector *q_vector, u8 intrl);

void ice_write_itr(struct ice_ring_container *rc, u16 itr);

void ice_set_q_vector_intrl(struct ice_q_vector *q_vector);