From: Hauke Mehrtens Date: Sun, 15 Sep 2013 13:29:14 +0000 (+0000) Subject: kernel: b53: fix vlan write for BCM5325 revison 3+ X-Git-Tag: reboot~9300 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=49d7c57fd131168517ac04cc6ed29f19e275f074;p=oweals%2Fopenwrt.git kernel: b53: fix vlan write for BCM5325 revison 3+ These switches are integrated in some recent BCM53XX and BCM47XX SoCs like the BCM53572. Signed-off-by: Hauke Mehrtens SVN-Revision: 37994 --- 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 d1fc930f27..4d1e0ee4ba 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 @@ -188,8 +188,13 @@ static void b53_set_vlan_entry(struct b53_device *dev, u16 vid, u16 members, if (is5325(dev)) { u32 entry = 0; - if (members) - entry = (untag << VA_UNTAG_S) | members | VA_VALID_25; + if (members) { + entry = (untag << VA_UNTAG_S) | members; + if (dev->core_rev >= 3) + entry |= VA_VALID_25_R4 | vid << VA_VID_HIGH_S; + else + entry |= VA_VALID_25; + } b53_write32(dev, B53_VLAN_PAGE, B53_VLAN_WRITE_25, entry); b53_write16(dev, B53_VLAN_PAGE, B53_VLAN_TABLE_ACCESS_25, vid |