From 79db770bfc2e5926e05fe252c3c3eb9a13657e94 Mon Sep 17 00:00:00 2001
From: Michael Chan <mchan@broadcom.com>
Date: Tue, 13 Dec 2005 21:09:54 -0800
Subject: [PATCH] --- yaml --- r: 15122 b: refs/heads/master c:
 16fe9d74f14ed74af778c5db7f9129e29916f4a7 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/net/tg3.c | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 94b0d51f3b99..f82b493eb579 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a9eba15f51c56da637e45ea1316eaa2a848986a
+refs/heads/master: 16fe9d74f14ed74af778c5db7f9129e29916f4a7
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
index 6b7ab4b72752..a143c18c7bc6 100644
--- a/trunk/drivers/net/tg3.c
+++ b/trunk/drivers/net/tg3.c
@@ -10443,8 +10443,13 @@ static struct pci_dev * __devinit tg3_find_5704_peer(struct tg3 *tp)
 			break;
 		pci_dev_put(peer);
 	}
-	if (!peer || peer == tp->pdev)
-		BUG();
+	/* 5704 can be configured in single-port mode, set peer to
+	 * tp->pdev in that case.
+	 */
+	if (!peer) {
+		peer = tp->pdev;
+		return peer;
+	}
 
 	/*
 	 * We don't need to keep the refcount elevated; there's no way