From: Jonas Gorski Date: Thu, 21 Feb 2013 11:45:38 +0000 (+0000) Subject: generic: b53: clear SM_SW_FWD_MODE unconditionally when enabling VLAN X-Git-Tag: reboot~11180 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3010a0b6166c9c73ea9582b781d6e6e3c99635f5;p=openwrt%2Fstaging%2Fxback.git generic: b53: clear SM_SW_FWD_MODE unconditionally when enabling VLAN 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 SVN-Revision: 35723 --- 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;