From c2ddf9217ffbb2b7c0dd138b640d2bc15fbcf9b6 Mon Sep 17 00:00:00 2001 From: wanghaoxiang1 Date: Tue, 13 Feb 2018 15:05:04 +0800 Subject: [PATCH] eth: hisilicon: hikey970: enable r8168 Ethernet driver for hikey970 --- arch/arm64/configs/hikey970_defconfig | 2 +- drivers/net/ethernet/realtek/r8168_n.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/arm64/configs/hikey970_defconfig b/arch/arm64/configs/hikey970_defconfig index a08bfe20a885..a0e6a35a7b15 100644 --- a/arch/arm64/configs/hikey970_defconfig +++ b/arch/arm64/configs/hikey970_defconfig @@ -296,7 +296,7 @@ CONFIG_E1000E=y CONFIG_IGB=y CONFIG_IGBVF=y CONFIG_SKY2=y -# CONFIG_R8168 is not set +CONFIG_R8168=y CONFIG_RAVB=y CONFIG_SMC91X=y CONFIG_SMSC911X=y diff --git a/drivers/net/ethernet/realtek/r8168_n.c b/drivers/net/ethernet/realtek/r8168_n.c index 1fb7fb5d6d49..4cd540aa3f13 100755 --- a/drivers/net/ethernet/realtek/r8168_n.c +++ b/drivers/net/ethernet/realtek/r8168_n.c @@ -25238,11 +25238,8 @@ static int rtl8168_open(struct net_device *dev) if (retval<0) goto err_free_all_allocated_mem; -#if 0 /* Resolve No buff space available */ if (tp->esd_flag == 0) rtl8168_request_esd_timer(dev); -#endif - tp->esd_flag = 0; rtl8168_request_link_timer(dev);