@@ -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
@@ -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"
@@ -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;
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@cisco.com> --- -- 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