Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760168AbZDJB4o (ORCPT ); Thu, 9 Apr 2009 21:56:44 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752144AbZDJB40 (ORCPT ); Thu, 9 Apr 2009 21:56:26 -0400 Received: from fg-out-1718.google.com ([72.14.220.156]:23856 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752072AbZDJB4Y (ORCPT ); Thu, 9 Apr 2009 21:56:24 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=h6ROV5NS5F6Y8atlikm8clbnrHvCceDrLCyjTUqribR9JLx/VMrPjR/pi35LX+cfJS F4zMgJZFR96nTF3lxpM+DByqjAx3VcX2WSw8ZEMYKRdIfwOdH1mRQ6Ee3gruhW9oo4VD pzx9waUQa3n3u1/ssZmG8nkwb12kmbkaF0pxc= Date: Fri, 10 Apr 2009 05:56:14 +0400 From: Alexander Beregalov To: David Miller , netdev@vger.kernel.org, Josh Boyer Cc: Kumar Gala , subrata@linux.vnet.ibm.com, Linuxppc-dev , linux-next , linux-kernel , linux-net@vger.kernel.org, Greg KH , sachinp , Stephen Rothwell Subject: Re: [BUILD FAILURE 04] Next April 9 : PPC64 randconfig [drivers/net/ibm_newemac/core.c] Message-ID: <20090410015614.GA5781@orion> References: <1239285152.5188.66.camel@subratamodak.linux.ibm.com> <20090409143112.GA7538@yoda.jdub.homelinux.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20090409143112.GA7538@yoda.jdub.homelinux.org> User-Agent: Mutt/1.5.19 (2009-01-05) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4723 Lines: 127 On Thu, Apr 09, 2009 at 10:31:12AM -0400, Josh Boyer wrote: > On Thu, Apr 09, 2009 at 09:28:23AM -0500, Kumar Gala wrote: > > > > On Apr 9, 2009, at 8:52 AM, Subrata Modak wrote: > > > >> Observed the following build error: > >> > >> CC drivers/net/ibm_newemac/core.o > >> drivers/net/ibm_newemac/core.c: In function ???emac_probe???: > >> drivers/net/ibm_newemac/core.c:2831: error: ???struct net_device??? has no > >> member named ???open??? > >> drivers/net/ibm_newemac/core.c:2834: error: ???struct net_device??? has no > >> member named ???tx_timeout??? > >> drivers/net/ibm_newemac/core.c:2836: error: ???struct net_device??? has no > >> member named ???stop??? > >> drivers/net/ibm_newemac/core.c:2837: error: ???struct net_device??? has no > >> member named ???get_stats??? > >> drivers/net/ibm_newemac/core.c:2838: error: ???struct net_device??? has no > >> member named ???set_multicast_list??? > >> drivers/net/ibm_newemac/core.c:2839: error: ???struct net_device??? has no > >> member named ???do_ioctl??? > >> drivers/net/ibm_newemac/core.c:2841: error: ???struct net_device??? has no > >> member named ???hard_start_xmit??? > >> drivers/net/ibm_newemac/core.c:2842: error: ???struct net_device??? has no > >> member named ???change_mtu??? > >> drivers/net/ibm_newemac/core.c:2845: error: ???struct net_device??? has no > >> member named ???hard_start_xmit??? > >> make[3]: *** [drivers/net/ibm_newemac/core.o] Error 1 > >> make[2]: *** [drivers/net/ibm_newemac] Error 2 > >> make[1]: *** [drivers/net] Error 2 > >> make: *** [drivers] Error 2 > >> > >> Regards-- > >> Subrata > >> > >> > > > > This is because CONFIG_COMPAT_NET_DEV_OPS isnt set and needs to be for > > this driver to build. I've asked the netdev guys about either fixing > > the driver or adding the proper thing to Kconfig to select > > CONFIG_COMPAT_NET_DEV_OPS. > > Thanks! > > If someone has pointers on what needs to be done to fix it, let me know. > From: Alexander Beregalov Subject: [PATCH] ibm_newemac: convert to netdev_ops Reported-by: Subrata Modak Signed-off-by: Alexander Beregalov --- drivers/net/ibm_newemac/core.c | 41 ++++++++++++++++++++++++++++----------- 1 files changed, 29 insertions(+), 12 deletions(-) diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c index 77e4b5b..806533c 100644 --- a/drivers/net/ibm_newemac/core.c +++ b/drivers/net/ibm_newemac/core.c @@ -2686,6 +2686,32 @@ static int __devinit emac_init_config(struct emac_instance *dev) return 0; } +static const struct net_device_ops emac_netdev_ops = { + .ndo_open = emac_open, + .ndo_stop = emac_close, + .ndo_get_stats = emac_stats, + .ndo_set_multicast_list = emac_set_multicast_list, + .ndo_do_ioctl = emac_ioctl, + .ndo_tx_timeout = emac_tx_timeout, + .ndo_validate_addr = eth_validate_addr, + .ndo_set_mac_address = eth_mac_addr, + .ndo_start_xmit = emac_start_xmit, + .ndo_change_mtu = eth_change_mtu, +}; + +static const struct net_device_ops emac_gige_netdev_ops = { + .ndo_open = emac_open, + .ndo_stop = emac_close, + .ndo_get_stats = emac_stats, + .ndo_set_multicast_list = emac_set_multicast_list, + .ndo_do_ioctl = emac_ioctl, + .ndo_tx_timeout = emac_tx_timeout, + .ndo_validate_addr = eth_validate_addr, + .ndo_set_mac_address = eth_mac_addr, + .ndo_start_xmit = emac_start_xmit_sg, + .ndo_change_mtu = emac_change_mtu, +}; + static int __devinit emac_probe(struct of_device *ofdev, const struct of_device_id *match) { @@ -2827,23 +2853,14 @@ static int __devinit emac_probe(struct of_device *ofdev, if (err != 0) goto err_detach_tah; - /* Fill in the driver function table */ - ndev->open = &emac_open; if (dev->tah_dev) ndev->features |= NETIF_F_IP_CSUM | NETIF_F_SG; - ndev->tx_timeout = &emac_tx_timeout; ndev->watchdog_timeo = 5 * HZ; - ndev->stop = &emac_close; - ndev->get_stats = &emac_stats; - ndev->set_multicast_list = &emac_set_multicast_list; - ndev->do_ioctl = &emac_ioctl; if (emac_phy_supports_gige(dev->phy_mode)) { - ndev->hard_start_xmit = &emac_start_xmit_sg; - ndev->change_mtu = &emac_change_mtu; + ndev->netdev_ops = &emac_gige_netdev_ops; dev->commac.ops = &emac_commac_sg_ops; - } else { - ndev->hard_start_xmit = &emac_start_xmit; - } + } else + ndev->netdev_ops = &emac_netdev_ops; SET_ETHTOOL_OPS(ndev, &emac_ethtool_ops); netif_carrier_off(ndev); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/