From patchwork Sat Mar 19 13:10:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corcodel Marian X-Patchwork-Id: 599766 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3qS38C2NHWz9sBM for ; Sun, 20 Mar 2016 00:38:35 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754366AbcCSNi1 (ORCPT ); Sat, 19 Mar 2016 09:38:27 -0400 Received: from 5-14-53-82.residential.rdsnet.ro ([5.14.53.82]:35358 "EHLO marian1000.go.ro" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753326AbcCSNi0 (ORCPT ); Sat, 19 Mar 2016 09:38:26 -0400 X-Greylist: delayed 1651 seconds by postgrey-1.27 at vger.kernel.org; Sat, 19 Mar 2016 09:38:26 EDT Received: from [192.168.0.3] (helo=192-168-0-108.rdsnet.ro) by marian1000.go.ro with esmtp (Exim 4.84) (envelope-from ) id 1ahGcc-0000Qz-FB; Sat, 19 Mar 2016 15:08:50 +0200 From: Corcodel Marian To: netdev@vger.kernel.org Cc: Francois Romieu , Corcodel Marian Subject: [PATCH 2/2 net-next v3.16]r8169: Place rtl_netdev_opts after alls functions is ready Date: Sat, 19 Mar 2016 15:10:27 +0200 Message-Id: <1458393027-1927-2-git-send-email-asd@marian1000.go.ro> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1458393027-1927-1-git-send-email-asd@marian1000.go.ro> References: <1458393027-1927-1-git-send-email-asd@marian1000.go.ro> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On multi cpu is posible do not keep in track alls tasks and rtl_netdev_opts is placed after alls functions is fixed on structure (rtl8169_private) and after MAC ADDRESS is added on structure. Signed-off-by: Corcodel Marian --- drivers/net/ethernet/realtek/r8169.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 2594bbb..c798349 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -7008,7 +7008,6 @@ rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) } SET_NETDEV_DEV(dev, &pdev->dev); - dev->netdev_ops = &rtl_netdev_ops; tp = netdev_priv(dev); tp->dev = dev; tp->pci_dev = pdev; @@ -7152,6 +7151,7 @@ rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) for (i = 0; i < ETH_ALEN; i++) dev->dev_addr[i] = RTL_R8(MAC0 + i); + dev->netdev_ops = &rtl_netdev_ops; dev->ethtool_ops = &rtl8169_ethtool_ops; dev->watchdog_timeo = RTL8169_TX_TIMEOUT;