2019-06-19 10:03:06

by Rasmus Villemoes

[permalink] [raw]
Subject: [PATCH net] net: dsa: mv88e6xxx: fix shift of FID bits in mv88e6185_g1_vtu_loadpurge()

The comment is correct, but the code ends up moving the bits four
places too far, into the VTUOp field.

Fixes: 11ea809f1a74 (net: dsa: mv88e6xxx: support 256 databases)
Signed-off-by: Rasmus Villemoes <[email protected]>
---
drivers/net/dsa/mv88e6xxx/global1_vtu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/dsa/mv88e6xxx/global1_vtu.c b/drivers/net/dsa/mv88e6xxx/global1_vtu.c
index 4f7b522e5e59..764378dcbc0c 100644
--- a/drivers/net/dsa/mv88e6xxx/global1_vtu.c
+++ b/drivers/net/dsa/mv88e6xxx/global1_vtu.c
@@ -473,7 +473,7 @@ int mv88e6185_g1_vtu_loadpurge(struct mv88e6xxx_chip *chip,
* VTU DBNum[7:4] are located in VTU Operation 11:8
*/
op |= entry->fid & 0x000f;
- op |= (entry->fid & 0x00f0) << 8;
+ op |= (entry->fid & 0x00f0) << 4;
}

return mv88e6xxx_g1_vtu_op(chip, op);
--
2.20.1


2019-06-19 14:26:31

by David Miller

[permalink] [raw]
Subject: Re: [PATCH net] net: dsa: mv88e6xxx: fix shift of FID bits in mv88e6185_g1_vtu_loadpurge()

From: Rasmus Villemoes <[email protected]>
Date: Wed, 19 Jun 2019 10:02:13 +0000

> The comment is correct, but the code ends up moving the bits four
> places too far, into the VTUOp field.
>
> Fixes: 11ea809f1a74 (net: dsa: mv88e6xxx: support 256 databases)
> Signed-off-by: Rasmus Villemoes <[email protected]>

Applied and queued up for -stable.