Commit 32c1fdb5 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'hns3-next' 



Huazhong Tan says:

====================
net: hns3: misc updates for -next

This series includes some misc updates for the HNS3 ethernet driver.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 46fd4471 e407efdd

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

+0 −2
Original line number Diff line number Diff line
@@ -11126,8 +11126,6 @@ static void hclge_reset_prepare_general(struct hnae3_ae_dev *ae_dev, 


	if (hdev->reset_type == HNAE3_FLR_RESET)

		hdev->rst_stats.flr_rst_cnt++;

	else if (hdev->reset_type == HNAE3_FUNC_RESET)

		hdev->rst_stats.pf_rst_cnt++;

}



static void hclge_reset_done(struct hnae3_ae_dev *ae_dev)

drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c

+1 −1
Original line number Diff line number Diff line
@@ -3646,7 +3646,7 @@ static void hclgevf_get_link_mode(struct hnae3_handle *handle, 
}



#define MAX_SEPARATE_NUM	4

#define SEPARATOR_VALUE		0xFFFFFFFF

#define SEPARATOR_VALUE		0xFDFCFBFA

#define REG_NUM_PER_LINE	4

#define REG_LEN_PER_LINE	(REG_NUM_PER_LINE * sizeof(u32))

drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h

+2 −2

File changed.

Contains only whitespace changes.