]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
mv643xx_eth: get rid of individual port config extend register bit defines
authorLennert Buytenhek <buytenh@wantstofly.org>
Sat, 31 May 2008 23:17:44 +0000 (01:17 +0200)
committerLennert Buytenhek <buytenh@wantstofly.org>
Thu, 12 Jun 2008 06:40:24 +0000 (08:40 +0200)
The port config extend register is never changed at run time.
Document the meaning of the initial value, and delete the defines
for the individual bits in this register.

Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Acked-by: Dale Farnsworth <dale@farnsworth.org>
drivers/net/mv643xx_eth.c

index 6987485d0af0a1f9056ec5f4d23b64632df6b83e..3d9c412e9ea1837add7520454bf737286f468edb 100644 (file)
@@ -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));