From 5d2ce8a5cdc7221e2370037402b91bf41b3bbd0c Mon Sep 17 00:00:00 2001
From: Lennert Buytenhek <buytenh@wantstofly.org>
Date: Sun, 1 Jun 2008 01:17:44 +0200
Subject: [PATCH] --- yaml --- r: 103014 b: refs/heads/master c:
 376489a250be5a5abe07aa39aa9623c31031b55e h: refs/heads/master v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/net/mv643xx_eth.c | 16 ++++------------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 176cf6fa5bcd..bfdf153cc42f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9a073ea166983e180438e2989b07ec1b70bc1f5
+refs/heads/master: 376489a250be5a5abe07aa39aa9623c31031b55e
diff --git a/trunk/drivers/net/mv643xx_eth.c b/trunk/drivers/net/mv643xx_eth.c
index 6987485d0af0..3d9c412e9ea1 100644
--- a/trunk/drivers/net/mv643xx_eth.c
+++ b/trunk/drivers/net/mv643xx_eth.c
@@ -118,17 +118,6 @@ static char mv643xx_driver_version[] = "1.0";
 #define OTHER_MCAST_TABLE(p)		(0x1500 + ((p) << 10))
 #define UNICAST_TABLE(p)		(0x1600 + ((p) << 10))
 
-/* These macros describe Ethernet Port configuration extend reg (Px_cXR) bits*/
-#define CLASSIFY_EN				(1 << 0)
-#define SPAN_BPDU_PACKETS_AS_NORMAL		(0 << 1)
-#define SPAN_BPDU_PACKETS_TO_RX_QUEUE_7		(1 << 1)
-#define PARTITION_DISABLE			(0 << 2)
-#define PARTITION_ENABLE			(1 << 2)
-
-#define PORT_CONFIG_EXTEND_DEFAULT_VALUE		\
-		SPAN_BPDU_PACKETS_AS_NORMAL	|	\
-		PARTITION_DISABLE
-
 /* These macros describe Ethernet Port Sdma configuration reg (SDCR) bits */
 #define RIFB				(1 << 0)
 #define RX_BURST_SIZE_1_64BIT		(0 << 1)
@@ -2208,7 +2197,10 @@ static void eth_port_start(struct net_device *dev)
 	 */
 	wrl(mp, PORT_CONFIG(port_num), 0x00000000);
 
-	wrl(mp, PORT_CONFIG_EXT(port_num), PORT_CONFIG_EXTEND_DEFAULT_VALUE);
+	/*
+	 * Treat BPDUs as normal multicasts, and disable partition mode.
+	 */
+	wrl(mp, PORT_CONFIG_EXT(port_num), 0x00000000);
 
 	pscr = rdl(mp, PORT_SERIAL_CONTROL(port_num));