From 45d8b5166b188943a15d2eeba07cc9cec96e1b7b Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Thu, 21 Feb 2013 11:45:38 +0000 Subject: generic: b53: clear SM_SW_FWD_MODE unconditionally when enabling VLAN MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Setting this bit stops BCM53125 (bgmac actually) from receiving any packets. This bit is cleared conditionally in b53_switch_reset and it seems the same is done in bcmrobo.c which never sets that bit again. Signed-off-by: Rafał Miłecki git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35723 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/generic/files/drivers/net/phy/b53/b53_common.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'target') diff --git a/target/linux/generic/files/drivers/net/phy/b53/b53_common.c b/target/linux/generic/files/drivers/net/phy/b53/b53_common.c index 923d1555d1..41e6fa9881 100644 --- a/target/linux/generic/files/drivers/net/phy/b53/b53_common.c +++ b/target/linux/generic/files/drivers/net/phy/b53/b53_common.c @@ -244,10 +244,9 @@ static void b53_enable_vlan(struct b53_device *dev, int enable) b53_read8(dev, B53_VLAN_PAGE, B53_VLAN_CTRL5, &vc5); } - if (enable) { - if (!is63xx(dev)) - mgmt |= SM_SW_FWD_MODE; + mgmt &= ~SM_SW_FWD_MODE; + if (enable) { vc0 |= VC0_VLAN_EN | VC0_VID_CHK_EN | VC0_VID_HASH_VID; vc1 |= VC1_RX_MCST_UNTAG_EN | VC1_RX_MCST_FWD_EN; vc4 &= ~VC4_ING_VID_CHECK_MASK; @@ -267,7 +266,6 @@ static void b53_enable_vlan(struct b53_device *dev, int enable) vc5 &= ~VC5_VID_FFF_EN; } } else { - mgmt &= ~SM_SW_FWD_MODE; vc0 &= ~(VC0_VLAN_EN | VC0_VID_CHK_EN | VC0_VID_HASH_VID); vc1 &= ~(VC1_RX_MCST_UNTAG_EN | VC1_RX_MCST_FWD_EN); vc4 &= ~VC4_ING_VID_CHECK_MASK; -- cgit v1.2.3