Commit 22f69de1 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'hns3-fixes' 



Salil Mehta says:

====================
Misc. fixes for hns3 driver

Fixes for the miscellaneous problems found during the review of the code.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 630e4576 0600771f

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c

+3 −4
Original line number Diff line number Diff line
@@ -3966,7 +3966,6 @@ static void hclge_reset_event(struct pci_dev *pdev, struct hnae3_handle *handle) 
	 *    normalcy is to reset.

	 * 2. A new reset request from the stack due to timeout

	 *

	 * For the first case,error event might not have ae handle available.

	 * check if this is a new reset request and we are not here just because

	 * last reset attempt did not succeed and watchdog hit us again. We will

	 * know this if last reset request did not occur very recently (watchdog
@@ -3976,14 +3975,14 @@ static void hclge_reset_event(struct pci_dev *pdev, struct hnae3_handle *handle) 
	 * want to make sure we throttle the reset request. Therefore, we will

	 * not allow it again before 3*HZ times.

	 */

	if (!handle)

		handle = &hdev->vport[0].nic;



	if (time_before(jiffies, (hdev->last_reset_time +

				  HCLGE_RESET_INTERVAL))) {

		mod_timer(&hdev->reset_timer, jiffies + HCLGE_RESET_INTERVAL);

		return;

	} else if (hdev->default_reset_request) {

	}



	if (hdev->default_reset_request) {

		hdev->reset_level =

			hclge_get_reset_level(ae_dev,

					      &hdev->default_reset_request);