Sophie

Sophie

distrib > Mandriva > current > x86_64 > by-pkgid > d41cc2729f5f0fbbd2607b14a49457f3 > files > 20

kernel-xen-2.6.32.11-2mdv2010.1.src.rpm

From: Kieran Mansley <kmansley@solarflare.com>
Subject: set efhw_arch field of device type
References: bnc#489105
Patch-mainline: n/a

Acked-by: jbeulich@novell.com

--- head-2009-04-07.orig/drivers/net/sfc/sfc_resource/ci/efhw/common.h	2009-04-07 14:39:57.000000000 +0200
+++ head-2009-04-07/drivers/net/sfc/sfc_resource/ci/efhw/common.h	2009-04-07 15:02:05.000000000 +0200
@@ -41,6 +41,10 @@
 
 #include <ci/efhw/common_sysdep.h>
 
+enum efhw_arch {
+	EFHW_ARCH_FALCON,
+};
+
 typedef uint32_t efhw_buffer_addr_t;
 #define EFHW_BUFFER_ADDR_FMT	"[ba:%"PRIx32"]"
 
--- head-2009-04-07.orig/drivers/net/sfc/sfc_resource/nic.c	2009-04-07 14:39:57.000000000 +0200
+++ head-2009-04-07/drivers/net/sfc/sfc_resource/nic.c	2009-04-07 15:02:05.000000000 +0200
@@ -47,6 +47,7 @@ int efhw_device_type_init(struct efhw_de
 	switch (device_id) {
 	case 0x0703:
 	case 0x6703:
+		dt->arch = EFHW_ARCH_FALCON;
 		dt->variant = 'A';
 		switch (class_revision) {
 		case 0:
@@ -60,6 +61,7 @@ int efhw_device_type_init(struct efhw_de
 		}
 		break;
 	case 0x0710:
+		dt->arch = EFHW_ARCH_FALCON;
 		dt->variant = 'B';
 		switch (class_revision) {
 		case 2: