From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiner Kallweit Subject: [PATCH net-next 7/8] r8169: remove calls to rtl_set_rx_mode Date: Sat, 28 Apr 2018 22:19:43 +0200 Message-ID: References: <9b5f541e-8725-46ca-4466-0c3295229252@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Cc: "netdev@vger.kernel.org" To: David Miller , Realtek linux nic maintainers Return-path: Received: from mail-wm0-f65.google.com ([74.125.82.65]:37720 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751788AbeD1UUB (ORCPT ); Sat, 28 Apr 2018 16:20:01 -0400 Received: by mail-wm0-f65.google.com with SMTP id l1so8358406wmb.2 for ; Sat, 28 Apr 2018 13:20:01 -0700 (PDT) In-Reply-To: <9b5f541e-8725-46ca-4466-0c3295229252@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: __dev_open() calls the ndo_set_rx_mode callback anyway, so we don't have to do it here too. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 8c816f6c..c7b9301a 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -5445,8 +5445,6 @@ static void rtl_hw_start_8169(struct rtl8169_private *tp) RTL_W32(tp, RxMissed, 0); - rtl_set_rx_mode(tp->dev); - /* no early-rx interrupts */ RTL_W16(tp, MultiIntr, RTL_R16(tp, MultiIntr) & 0xf000); } @@ -6361,8 +6359,6 @@ static void rtl_hw_start_8168(struct rtl8169_private *tp) RTL_W8(tp, ChipCmd, CmdTxEnb | CmdRxEnb); - rtl_set_rx_mode(tp->dev); - RTL_W16(tp, MultiIntr, RTL_R16(tp, MultiIntr) & 0xf000); } @@ -6554,8 +6550,6 @@ static void rtl_hw_start_8101(struct rtl8169_private *tp) RTL_W8(tp, ChipCmd, CmdTxEnb | CmdRxEnb); - rtl_set_rx_mode(tp->dev); - RTL_R8(tp, IntrMask); RTL_W16(tp, MultiIntr, RTL_R16(tp, MultiIntr) & 0xf000); -- 2.17.0