From patchwork Fri Jan  7 18:48:05 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Michael Buesch <mb@bu3sch.de>
X-Patchwork-Id: 465051
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p07ImGtK012422
	for <patchwork-linux-wireless@patchwork.kernel.org>;
	Fri, 7 Jan 2011 18:48:20 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754106Ab1AGSsR (ORCPT
	<rfc822;patchwork-linux-wireless@patchwork.kernel.org>);
	Fri, 7 Jan 2011 13:48:17 -0500
Received: from 80-190-117-144.ip-home.de ([80.190.117.144]:60002 "EHLO
	bu3sch.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1754037Ab1AGSsQ (ORCPT <rfc822; linux-wireless@vger.kernel.org>);
	Fri, 7 Jan 2011 13:48:16 -0500
Received: by bu3sch.de with esmtpsa (Exim 4.69)
	(envelope-from <mb@bu3sch.de>)
	id 1PbHMD-0004tt-Mx; Fri, 07 Jan 2011 19:48:13 +0100
Subject: [PATCH] ssb: Ignore dangling ethernet cores on wireless devices
From: Michael =?ISO-8859-1?Q?B=FCsch?= <mb@bu3sch.de>
To: John Linville <linville@tuxdriver.com>
Cc: Larry Finger <Larry.Finger@lwfinger.net>,
	linux-wireless <linux-wireless@vger.kernel.org>,
	b43-dev <b43-dev@lists.infradead.org>
Date: Fri, 07 Jan 2011 19:48:05 +0100
Message-ID: <1294426085.18385.8.camel@maggie>
Mime-Version: 1.0
X-Mailer: Evolution 2.30.3 
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]);
	Fri, 07 Jan 2011 18:48:21 +0000 (UTC)


Index: linux-2.6.37/drivers/ssb/scan.c
===================================================================
--- linux-2.6.37.orig/drivers/ssb/scan.c	2011-01-07 15:35:10.518000002 +0100
+++ linux-2.6.37/drivers/ssb/scan.c	2011-01-07 15:45:54.231998930 +0100
@@ -420,6 +420,16 @@
 			bus->pcicore.dev = dev;
 #endif /* CONFIG_SSB_DRIVER_PCICORE */
 			break;
+		case SSB_DEV_ETHERNET:
+			if (bus->bustype == SSB_BUSTYPE_PCI) {
+				if (bus->host_pci->vendor == PCI_VENDOR_ID_BROADCOM &&
+				    (bus->host_pci->device & 0xFF00) == 0x4300) {
+					/* This is a dangling ethernet core on a
+					 * wireless device. Ignore it. */
+					continue;
+				}
+			}
+			break;
 		default:
 			break;
 		}