Commit 31d990cb authored by Yang Yingliang's avatar Yang Yingliang Committed by David S. Miller
Browse files

sfc: farch: fix compile warning in efx_farch_dimension_resources() 



Fix the following kernel build warning when CONFIG_SFC_SRIOV is disabled:

  drivers/net/ethernet/sfc/farch.c: In function ‘efx_farch_dimension_resources’:
  drivers/net/ethernet/sfc/farch.c:1671:21: warning: variable ‘buftbl_min’ set but not used [-Wunused-but-set-variable]
    unsigned vi_count, buftbl_min, total_tx_channels;

Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4057c58d

drivers/net/ethernet/sfc/farch.c

+7 −6
Original line number Diff line number Diff line
@@ -1668,13 +1668,17 @@ void efx_farch_rx_pull_indir_table(struct efx_nic *efx) 
 */

void efx_farch_dimension_resources(struct efx_nic *efx, unsigned sram_lim_qw)

{

	unsigned vi_count, buftbl_min, total_tx_channels;



	unsigned vi_count, total_tx_channels;

#ifdef CONFIG_SFC_SRIOV

	struct siena_nic_data *nic_data = efx->nic_data;

	struct siena_nic_data *nic_data;

	unsigned buftbl_min;

#endif



	total_tx_channels = efx->n_tx_channels + efx->n_extra_tx_channels;

	vi_count = max(efx->n_channels, total_tx_channels * EFX_MAX_TXQ_PER_CHANNEL);



#ifdef CONFIG_SFC_SRIOV

	nic_data = efx->nic_data;

	/* Account for the buffer table entries backing the datapath channels

	 * and the descriptor caches for those channels.

	 */
@@ -1682,9 +1686,6 @@ void efx_farch_dimension_resources(struct efx_nic *efx, unsigned sram_lim_qw) 
		       total_tx_channels * EFX_MAX_TXQ_PER_CHANNEL * EFX_MAX_DMAQ_SIZE +

		       efx->n_channels * EFX_MAX_EVQ_SIZE)

		      * sizeof(efx_qword_t) / EFX_BUF_SIZE);

	vi_count = max(efx->n_channels, total_tx_channels * EFX_MAX_TXQ_PER_CHANNEL);



#ifdef CONFIG_SFC_SRIOV

	if (efx->type->sriov_wanted) {

		if (efx->type->sriov_wanted(efx)) {

			unsigned vi_dc_entries, buftbl_free;