summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Pirko <jpirko@redhat.com>2011-08-15 22:33:34 +0000
committerDavid S. Miller <davem@davemloft.net>2011-08-17 20:13:39 -0700
commit9a75a97296c43c34add7dca8275496186e1b4ae9 (patch)
tree97586714a41f12fb2d18a42690fa4c823c1de9b4
parentba3211ccd043fae3713793334d64d75bd0a1d029 (diff)
via-velocity: remove non-tagged packet filtering
It's undesired to filter untagged packets at any time. So simply remove this. Reported-by: Stephan Bärwolf <stephan.baerwolf@tu-ilmenau.de> Tested-by: Stephan Bärwolf <stephan.baerwolf@tu-ilmenau.de> Signed-off-by: Jiri Pirko <jpirko@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/via-velocity.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index deb1eca13c9f..7c5336c5c37f 100644
--- a/drivers/net/via-velocity.c
+++ b/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);