linux/drivers/net/dsa
Vivien Didelot 40a7166044 net: dsa: mv88e6xxx: fix fid_mask when leaving bridge
The mv88e6xxx_priv_state structure contains an fid_mask, where 1 means
the FID is free to use, 0 means the FID is in use.

This patch fixes the bit clear in mv88e6xxx_leave_bridge() when
assigning a new FID to a port.

Example scenario: I have 7 ports, port 5 is CPU, port 6 is unused (no
PHY). After setting the ports 0, 1 and 2 in bridge br0, and ports 3 and
4 in bridge br1, I have the following fid_mask: 0b111110010110 (0xf96).

Indeed, br0 uses FID 0, and br1 uses FID 3.

After setting nomaster for port 0, I get the wrong fid_mask: 0b10 (0x2).

With this patch we correctly get 0b111110010100 (0xf94), meaning port 0
uses FID 1, br0 uses FID 0, and br1 uses FID 3.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-07-20 12:44:14 -07:00
..
bcm_sf2_regs.h net: dsa: bcm_sf2: add HW bridging support 2015-02-25 17:03:38 -05:00
bcm_sf2.c net: dsa: bcm_sf2: Utilize BRCM_PSEUDO_PHY_ADDR 2015-06-10 23:33:58 -07:00
bcm_sf2.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-03-03 21:16:48 -05:00
Kconfig net: dsa: mv88e6171: Add other members of the family 2015-05-09 16:05:53 -04:00
Makefile net: dsa: Add support for Marvell 88E6352 2014-10-30 14:54:10 -04:00
mv88e6xxx.c net: dsa: mv88e6xxx: fix fid_mask when leaving bridge 2015-07-20 12:44:14 -07:00
mv88e6xxx.h dsa: mv88x6xxx: Add debugfs interface for scratch registers 2015-06-23 06:33:42 -07:00
mv88e6060.c net: dsa: Report known silicon revisions for Marvell 88E6060 2014-10-30 14:54:10 -04:00
mv88e6123_61_65.c net: dsa: Converting remaining registers to mnemonics 2015-05-09 16:05:53 -04:00
mv88e6131.c net: dsa: mv88e6131: Add support for mv88e6185 2015-05-09 16:05:53 -04:00
mv88e6171.c net: dsa: mv88e6171: Add other members of the family 2015-05-09 16:05:53 -04:00
mv88e6352.c net: dsa: Move mv88e6172 support into mv88e6352 family driver 2015-05-09 16:05:53 -04:00