netdev - [PATCH] enic: fix compile on x86 and ia64 and fix Kconfig

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <Pine.LNX.4.64.0809200202060.13272@palito_client100.nuovasystems.com>
Date:	Sat, 20 Sep 2008 02:10:01 -0700 (PDT)
From:	Scott Feldman <scofeldm@...co.com>
To:	jgarzik@...ox.com
cc:	netdev@...r.kernel.org
Subject: [PATCH] enic: fix compile on x86 and ia64 and fix Kconfig

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 <scofeldm@...co.com>
---
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 <linux/ip.h>
  #include <linux/ipv6.h>
  #include <linux/tcp.h>
+#include <net/ip6_checksum.h>

  #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;
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html