From 0cdab0237da84284054f63897e8e094d47f13bf1 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Wed, 13 Nov 2013 18:04:39 +0000 Subject: kernel: b53: fix untagged shift for BCM5365 The BCM5365 needs a shift of 7 bits and not 6 bits like the BCM5325 for the untagged ports. Thank you Russell for reporting this and testing the patch. Signed-off-by: Hauke Mehrtens SVN-Revision: 38793 --- target/linux/generic/files/drivers/net/phy/b53/b53_common.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'target/linux/generic/files/drivers/net/phy/b53/b53_common.c') 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 39027c1771..f5dd068a1b 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 @@ -189,7 +189,8 @@ static void b53_set_vlan_entry(struct b53_device *dev, u16 vid, u16 members, u32 entry = 0; if (members) { - entry = (untag << VA_UNTAG_S) | members; + entry = ((untag & VA_UNTAG_MASK_25) << VA_UNTAG_S_25) | + members; if (dev->core_rev >= 3) entry |= VA_VALID_25_R4 | vid << VA_VID_HIGH_S; else @@ -203,7 +204,8 @@ static void b53_set_vlan_entry(struct b53_device *dev, u16 vid, u16 members, u16 entry = 0; if (members) - entry = (untag << VA_UNTAG_S) | members | VA_VALID_65; + entry = ((untag & VA_UNTAG_MASK_65) << VA_UNTAG_S_65) | + members | VA_VALID_65; b53_write16(dev, B53_VLAN_PAGE, B53_VLAN_WRITE_65, entry); b53_write16(dev, B53_VLAN_PAGE, B53_VLAN_TABLE_ACCESS_65, vid | -- cgit v1.2.3