---

yaml --- r: 263227 b: refs/heads/master c: 9a75a97 h: refs/heads/master i: 263225: 6ad46b2 263223: 1d2c863 v: v3
git-mirror · Aug 18, 2011 · 3f899ee · 3f899ee
1 parent f9248dd
commit 3f899ee
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git 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
@@ -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);