From patchwork Tue Apr 14 18:39:38 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Beregalov X-Patchwork-Id: 25938 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 7C0AB5F2A7 for ; Wed, 15 Apr 2009 04:40:54 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755658AbZDNSkK (ORCPT ); Tue, 14 Apr 2009 14:40:10 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753458AbZDNSkH (ORCPT ); Tue, 14 Apr 2009 14:40:07 -0400 Received: from ti-out-0910.google.com ([209.85.142.186]:36847 "EHLO ti-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751912AbZDNSkE (ORCPT ); Tue, 14 Apr 2009 14:40:04 -0400 Received: by ti-out-0910.google.com with SMTP id 11so324082tim.23 for ; Tue, 14 Apr 2009 11:40:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:references:mime-version:content-type:content-disposition :in-reply-to:user-agent; bh=8HkYLj6ZraT+VEoM/FsomVQeqKfE7VK7POqFZzlRUOw=; b=QUDqZj6EhN2Z2J2rXcMHz8EyH/NOi1ATI2/vN7No9SOFywXWRZctAOFZi1xKE9X8UI pPGsjWMdtdryB1THkznnPYzDAFvdfmByp7MnarXYZsksSTZP+ibYYRClO9MSEDOPwq3A CGUuWCggc1AANumEA7GEwVrwhG3lHmNevw+Qo= 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=geAwXihpJt/0T4Iy+3CZ3xeobb8bF9gQUOBomrj75dAL50tYlt/az9FTAoM5zZ/KN/ zs/311Ilr39ZNVdLop7NtkQgS0q6NkxdT1r0dSJuYvPx7BsnoicTw2N9Eke0rKUo8lqc o7UiztBf7FYG9B0nRTvFxpkoO5tEW1obNS0m4= Received: by 10.110.28.15 with SMTP id b15mr8603250tib.46.1239734402015; Tue, 14 Apr 2009 11:40:02 -0700 (PDT) Received: from orion (ppp91-78-157-235.pppoe.mtu-net.ru [91.78.157.235]) by mx.google.com with ESMTPS id d1sm225905tid.34.2009.04.14.11.39.52 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 14 Apr 2009 11:40:00 -0700 (PDT) Date: Tue, 14 Apr 2009 22:39:38 +0400 From: Alexander Beregalov To: David Miller , netdev@vger.kernel.org, Subrata Modak Cc: Linuxppc-dev , Greg KH , Christoph Raisch , Jan-Bernd Themann , Thomas Klein , Julia Lawall , Jeff Garzik , Mel Gorman , Stephen Rothwell , linux-next , sachinp , linux-kernel , "Rafael J. Wysocki" , linux-net Subject: Re: [BUILD FAILURE 06/12] Next April 14 : PPC64 randconfig [drivers/net/ehea/ehea_main.c] Message-ID: <20090414183938.GA17134@orion> References: <1239733747.5344.78.camel@subratamodak.linux.ibm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1239733747.5344.78.camel@subratamodak.linux.ibm.com> User-Agent: Mutt/1.5.19 (2009-01-05) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Tue, Apr 14, 2009 at 11:59:07PM +0530, Subrata Modak wrote: > Observed the following build error: > CC drivers/net/ehea/ehea_main.o > drivers/net/ehea/ehea_main.c: In function ???ehea_setup_single_port???: > drivers/net/ehea/ehea_main.c:3145: error: ???struct net_device??? has no > member named ???tx_timeout??? From 56142fa2ed992aeee3f2635990ac37807379a310 Mon Sep 17 00:00:00 2001 From: Alexander Beregalov Date: Tue, 14 Apr 2009 22:35:32 +0400 Subject: [PATCH] ehea: Fix incomplete conversion to net_device_ops Reported-by: Subrata Modak Signed-off-by: Alexander Beregalov --- drivers/net/ehea/ehea_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c index ac0c5b4..604c844 100644 --- a/drivers/net/ehea/ehea_main.c +++ b/drivers/net/ehea/ehea_main.c @@ -3080,7 +3080,8 @@ static const struct net_device_ops ehea_netdev_ops = { .ndo_change_mtu = ehea_change_mtu, .ndo_vlan_rx_register = ehea_vlan_rx_register, .ndo_vlan_rx_add_vid = ehea_vlan_rx_add_vid, - .ndo_vlan_rx_kill_vid = ehea_vlan_rx_kill_vid + .ndo_vlan_rx_kill_vid = ehea_vlan_rx_kill_vid, + .ndo_tx_timeout = ehea_tx_watchdog, }; struct ehea_port *ehea_setup_single_port(struct ehea_adapter *adapter, @@ -3142,7 +3143,6 @@ struct ehea_port *ehea_setup_single_port(struct ehea_adapter *adapter, | NETIF_F_HIGHDMA | NETIF_F_IP_CSUM | NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER | NETIF_F_LLTX; - dev->tx_timeout = &ehea_tx_watchdog; dev->watchdog_timeo = EHEA_WATCH_DOG_TIMEOUT; INIT_WORK(&port->reset_task, ehea_reset_port);