Unverified Commit 01efb318 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15443 i40e: Fix call trace in setup_tx_descriptors 

Merge Pull Request from: @ci-robot 
 
PR sync from: Chen Ridong <chenridong@huawei.com>
https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/ZFJBWVZQMK444UAGHWH3DYSMOCVIY3OQ/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBP4HT 
 
Link:https://gitee.com/openeuler/kernel/pulls/15443

 

Reviewed-by: default avatarYuan Can <yuancan@huawei.com>
Signed-off-by: default avatarYuan Can <yuancan@huawei.com>
parents 9a1c3b15 15b963bc

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

+17 −8
Original line number Diff line number Diff line
@@ -2195,15 +2195,16 @@ static void i40e_diag_test(struct net_device *netdev, 


		set_bit(__I40E_TESTING, pf->state);



		if (test_bit(__I40E_RESET_RECOVERY_PENDING, pf->state) ||

		    test_bit(__I40E_RESET_INTR_RECEIVED, pf->state)) {

			dev_warn(&pf->pdev->dev,

				 "Cannot start offline testing when PF is in reset state.\n");

			goto skip_ol_tests;

		}



		if (i40e_active_vfs(pf) || i40e_active_vmdqs(pf)) {

			dev_warn(&pf->pdev->dev,

				 "Please take active VFs and Netqueues offline and restart the adapter before running NIC diagnostics\n");

			data[I40E_ETH_TEST_REG]		= 1;

			data[I40E_ETH_TEST_EEPROM]	= 1;

			data[I40E_ETH_TEST_INTR]	= 1;

			data[I40E_ETH_TEST_LINK]	= 1;

			eth_test->flags |= ETH_TEST_FL_FAILED;

			clear_bit(__I40E_TESTING, pf->state);

			goto skip_ol_tests;

		}
@@ -2250,9 +2251,17 @@ static void i40e_diag_test(struct net_device *netdev, 
		data[I40E_ETH_TEST_INTR] = 0;

	}



skip_ol_tests:



	netif_info(pf, drv, netdev, "testing finished\n");

	return;



skip_ol_tests:

	data[I40E_ETH_TEST_REG]		= 1;

	data[I40E_ETH_TEST_EEPROM]	= 1;

	data[I40E_ETH_TEST_INTR]	= 1;

	data[I40E_ETH_TEST_LINK]	= 1;

	eth_test->flags |= ETH_TEST_FL_FAILED;

	clear_bit(__I40E_TESTING, pf->state);

	netif_info(pf, drv, netdev, "testing failed\n");

}



static void i40e_get_wol(struct net_device *netdev,