From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 18 May 2006 07:21:26 +0000 (+1000)
Subject: [PATCH] powerpc: the iSeries vio lan driver changed device type
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=1dc461f0b03fab309eb9214df1c9b586aeaf3b22;p=deliverable%2Flinux.git

[PATCH] powerpc: the iSeries vio lan driver changed device type

So the IOMMU table building code needs to match.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
index 2cda65b8171b..fe92727aca30 100644
--- a/arch/powerpc/kernel/vio.c
+++ b/arch/powerpc/kernel/vio.c
@@ -71,7 +71,7 @@ static struct iommu_table *vio_build_iommu_table(struct vio_dev *dev)
 {
 #ifdef CONFIG_PPC_ISERIES
 	if (firmware_has_feature(FW_FEATURE_ISERIES)) {
-		if (strcmp(dev->type, "vlan") == 0)
+		if (strcmp(dev->type, "network") == 0)
 			return &veth_iommu_table;
 		return &vio_iommu_table;
 	} else