{"id":703,"url":"http://patchwork.ozlabs.org/api/1.0/patches/703/?format=json","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.0/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"","date":"2008-09-20T09:10:01","name":"enic: fix compile on x86 and ia64 and fix Kconfig","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"d3d84eeb7eb8c57db518d0e716070fd84c4460f6","submitter":{"id":341,"url":"http://patchwork.ozlabs.org/api/1.0/people/341/?format=json","name":"Scott Feldman","email":"scofeldm@cisco.com"},"delegate":{"id":36,"url":"http://patchwork.ozlabs.org/api/1.0/users/36/?format=json","username":"jgarzik","first_name":"Jeff","last_name":"Garzik","email":"jgarzik@pobox.com"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/Pine.LNX.4.64.0809200202060.13272@palito_client100.nuovasystems.com/mbox/","series":[],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/703/checks/","tags":{},"headers":{"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])\n\tby ozlabs.org (Postfix) with ESMTP id 8197ADDECF\n\tfor ;\n\tSat, 20 Sep 2008 19:12:00 +1000 (EST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751017AbYITJLR (ORCPT );\n\tSat, 20 Sep 2008 05:11:17 -0400","(majordomo@vger.kernel.org) by vger.kernel.org id S1751033AbYITJLR\n\t(ORCPT ); Sat, 20 Sep 2008 05:11:17 -0400","from nuova-ex1.nuovasystems.com ([67.91.200.196]:1457 \"EHLO\n\tnuova-ex1.nuovasystems.com\" rhost-flags-OK-OK-OK-OK)\n\tby vger.kernel.org with ESMTP id S1751009AbYITJLQ (ORCPT\n\t); Sat, 20 Sep 2008 05:11:16 -0400","from [172.16.18.48] ([172.16.18.48] RDNS failed) by\n\tnuova-ex1.nuovasystems.com with Microsoft SMTPSVC(6.0.3790.3959); \n\tSat, 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","Content-Type":"TEXT/PLAIN; charset=US-ASCII; format=flowed","X-OriginalArrivalTime":"20 Sep 2008 09:11:15.0911 (UTC)\n\tFILETIME=[D5E27D70:01C91B00]","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"enic: fix compile on x86 and ia64 and fix Kconfig\n\no readq/writeq aren't defined on all archs, so define 'em conditionally here\no for ia64, include net/ip6_checksum.h for csum_ipv6_magic\no fix mangled Kconfig description\n\nSigned-off-by: Scott Feldman \n---\n--\nTo unsubscribe from this list: send the line \"unsubscribe netdev\" in\nthe body of a message to majordomo@vger.kernel.org\nMore majordomo info at http://vger.kernel.org/majordomo-info.html","diff":"diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig\nindex 69c81da..8217138 100644\n--- a/drivers/net/Kconfig\n+++ b/drivers/net/Kconfig\n@@ -2401,7 +2401,7 @@ config EHEA\n \t will be called ehea.\n\n config ENIC\n-\ttristate \"E, the Cisco 10G Ethernet NIC\"\n+\ttristate \"Cisco 10G Ethernet NIC support\"\n \tdepends on PCI && INET\n \tselect INET_LRO\n \thelp\ndiff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c\nindex 4cf5ec7..2592e52 100644\n--- a/drivers/net/enic/enic_main.c\n+++ b/drivers/net/enic/enic_main.c\n@@ -34,6 +34,7 @@\n #include \n #include \n #include \n+#include \n\n #include \"cq_enet_desc.h\"\n #include \"vnic_dev.h\"\ndiff --git a/drivers/net/enic/vnic_dev.c b/drivers/net/enic/vnic_dev.c\nindex 4d104f5..84d3592 100644\n--- a/drivers/net/enic/vnic_dev.c\n+++ b/drivers/net/enic/vnic_dev.c\n@@ -29,6 +29,20 @@\n #include \"vnic_dev.h\"\n #include \"vnic_stats.h\"\n\n+#ifndef readq\n+static inline u64 readq(void __iomem *reg)\n+{\n+\treturn (((u64)readl(reg + 0x4UL) << 32) |\n+\t\t(u64)readl(reg));\n+}\n+\n+static inline void writeq(u64 val, void __iomem *reg)\n+{\n+\twritel(val & 0xffffffff, reg);\n+\twritel(val >> 32, reg + 0x4UL);\n+}\n+\n+#endif\n struct vnic_res {\n \tvoid __iomem *vaddr;\n \tunsigned int count;\n","prefixes":[]}