From 3f899ee212723f1db9258c95418d1786644dd9f3 Mon Sep 17 00:00:00 2001
From: Jiri Pirko <jpirko@redhat.com>
Date: Mon, 15 Aug 2011 22:33:34 +0000
Subject: [PATCH] --- yaml --- r: 263227 b: refs/heads/master c:
 9a75a97296c43c34add7dca8275496186e1b4ae9 h: refs/heads/master i:   263225:
 6ad46b28f3a9dc07935fb17169eb01a7384f3c44   263223:
 1d2c8633c20fb172017a770730959962eaa01910 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/net/via-velocity.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index ae1dedbaa801..08a269aadac9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba3211ccd043fae3713793334d64d75bd0a1d029
+refs/heads/master: 9a75a97296c43c34add7dca8275496186e1b4ae9
diff --git a/trunk/drivers/net/via-velocity.c b/trunk/drivers/net/via-velocity.c
index deb1eca13c9f..7c5336c5c37f 100644
--- a/trunk/drivers/net/via-velocity.c
+++ b/trunk/drivers/net/via-velocity.c
@@ -515,10 +515,6 @@ static void velocity_init_cam_filter(struct velocity_info *vptr)
 	mac_set_cam_mask(regs, vptr->mCAMmask);
 
 	/* Enable VCAMs */
-
-	if (test_bit(0, vptr->active_vlans))
-		WORD_REG_BITS_ON(MCFG_RTGOPT, &regs->MCFG);
-
 	for_each_set_bit(vid, vptr->active_vlans, VLAN_N_VID) {
 		mac_set_vlan_cam(regs, i, (u8 *) &vid);
 		vptr->vCAMmask[i / 8] |= 0x1 << (i % 8);