From patchwork Sat Sep 20 02:28:42 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herton Ronaldo Krzesinski X-Patchwork-Id: 686 X-Patchwork-Delegate: jgarzik@pobox.com 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 00460DDEE0 for ; Sat, 20 Sep 2008 12:29:00 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752939AbYITC2w (ORCPT ); Fri, 19 Sep 2008 22:28:52 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752785AbYITC2w (ORCPT ); Fri, 19 Sep 2008 22:28:52 -0400 Received: from perninha.conectiva.com.br ([200.140.247.100]:53347 "EHLO perninha.conectiva.com.br" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752719AbYITC2u (ORCPT ); Fri, 19 Sep 2008 22:28:50 -0400 Received: from localhost (perninha.conectiva.com.br [127.0.0.1]) by perninha.conectiva.com.br (Postfix) with ESMTP id 172FB3EB8; Fri, 19 Sep 2008 22:29:05 -0400 (EDT) X-Virus-Scanned: amavisd-new at conectiva.com.br Received: from perninha.conectiva.com.br ([127.0.0.1]) by localhost (perninha.conectiva.com.br [127.0.0.1]) (amavisd-new, port 10025) with LMTP id bv9H4tjJtPqy; Fri, 19 Sep 2008 22:29:04 -0400 (EDT) Received: from fox.conectiva (fox.conectiva [10.0.2.195]) by perninha.conectiva.com.br (Postfix) with ESMTP id A7E7F3EB4; Fri, 19 Sep 2008 22:29:03 -0400 (EDT) Received: from [172.21.225.18] (unknown [172.21.225.18]) by fox.conectiva (Postfix) with ESMTP id 09C9B2F3BE; Fri, 19 Sep 2008 23:28:43 -0300 (BRT) From: Herton Ronaldo Krzesinski Organization: Mandriva To: David Miller Subject: Re: [git patches] new network drivers for net-next Date: Fri, 19 Sep 2008 23:28:42 -0300 User-Agent: KMail/1.9.10 Cc: jeff@garzik.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org References: <20080918160005.GA24281@havoc.gtf.org> <20080919.155342.12059190.davem@davemloft.net> In-Reply-To: <20080919.155342.12059190.davem@davemloft.net> MIME-Version: 1.0 Message-Id: <200809192328.42387.herton@mandriva.com.br> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Friday 19 September 2008 19:53:42 David Miller wrote: > From: Jeff Garzik > Date: Thu, 18 Sep 2008 12:00:05 -0400 > > > > > Please pull from 'new-drivers' branch of > > master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git new-drivers > > > > to receive the following updates: > > Pulled, thanks Jeff. > > I'll push this to net-next-2.6 after a quick build sanity test. Hi, with new enic driver I get the following build error on i386 (config attached): CC [M] drivers/net/enic/vnic_cq.o drivers/net/enic/vnic_cq.c: In function 'vnic_cq_init': drivers/net/enic/vnic_cq.c:65: error: implicit declaration of function 'writeq' make[2]: *** [drivers/net/enic/vnic_cq.o] Error 1 make[1]: *** [drivers/net/enic] Error 2 make: *** [_module_drivers/net] Error 2 Something like patch below (borrowed from net/s2io.h, ok to use it?) fixes it: --- linux-2.6.27/drivers/net/enic/vnic_dev.h.orig 2008-09-19 13:57:43.000000000 -0300 +++ linux-2.6.27/drivers/net/enic/vnic_dev.h 2008-09-19 14:00:57.000000000 -0300 @@ -23,6 +23,26 @@ #include "vnic_resource.h" #include "vnic_devcmd.h" +#include +#ifndef readq +static inline u64 readq(void __iomem *addr) +{ + u64 ret = 0; + ret = readl(addr + 4); + ret <<= 32; + ret |= readl(addr); + + return ret; +} +#endif +#ifndef writeq +static inline void writeq(u64 val, void __iomem *addr) +{ + writel((u32) (val), addr); + writel((u32) (val >> 32), (addr + 4)); +} +#endif + #ifndef VNIC_PADDR_TARGET #define VNIC_PADDR_TARGET 0x0000000000000000ULL #endif