From patchwork Sat Sep 20 09:10:01 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Feldman X-Patchwork-Id: 703 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 8197ADDECF for ; Sat, 20 Sep 2008 19:12:00 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751017AbYITJLR (ORCPT ); Sat, 20 Sep 2008 05:11:17 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751033AbYITJLR (ORCPT ); Sat, 20 Sep 2008 05:11:17 -0400 Received: from nuova-ex1.nuovasystems.com ([67.91.200.196]:1457 "EHLO nuova-ex1.nuovasystems.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751009AbYITJLQ (ORCPT ); Sat, 20 Sep 2008 05:11:16 -0400 Received: from [172.16.18.48] ([172.16.18.48] RDNS failed) by nuova-ex1.nuovasystems.com with Microsoft SMTPSVC(6.0.3790.3959); Sat, 20 Sep 2008 02:11:15 -0700 Date: Sat, 20 Sep 2008 02:10:01 -0700 (PDT) From: Scott Feldman X-X-Sender: sfeldma@palito_client100.nuovasystems.com To: jgarzik@pobox.com cc: netdev@vger.kernel.org Subject: [PATCH] enic: fix compile on x86 and ia64 and fix Kconfig Message-ID: MIME-Version: 1.0 X-OriginalArrivalTime: 20 Sep 2008 09:11:15.0911 (UTC) FILETIME=[D5E27D70:01C91B00] Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org enic: fix compile on x86 and ia64 and fix Kconfig o readq/writeq aren't defined on all archs, so define 'em conditionally here o for ia64, include net/ip6_checksum.h for csum_ipv6_magic o fix mangled Kconfig description Signed-off-by: Scott Feldman --- -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 69c81da..8217138 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -2401,7 +2401,7 @@ config EHEA will be called ehea. config ENIC - tristate "E, the Cisco 10G Ethernet NIC" + tristate "Cisco 10G Ethernet NIC support" depends on PCI && INET select INET_LRO help diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c index 4cf5ec7..2592e52 100644 --- a/drivers/net/enic/enic_main.c +++ b/drivers/net/enic/enic_main.c @@ -34,6 +34,7 @@ #include #include #include +#include #include "cq_enet_desc.h" #include "vnic_dev.h" diff --git a/drivers/net/enic/vnic_dev.c b/drivers/net/enic/vnic_dev.c index 4d104f5..84d3592 100644 --- a/drivers/net/enic/vnic_dev.c +++ b/drivers/net/enic/vnic_dev.c @@ -29,6 +29,20 @@ #include "vnic_dev.h" #include "vnic_stats.h" +#ifndef readq +static inline u64 readq(void __iomem *reg) +{ + return (((u64)readl(reg + 0x4UL) << 32) | + (u64)readl(reg)); +} + +static inline void writeq(u64 val, void __iomem *reg) +{ + writel(val & 0xffffffff, reg); + writel(val >> 32, reg + 0x4UL); +} + +#endif struct vnic_res { void __iomem *vaddr; unsigned int count;