Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35532c21 authored by Lennart Sorensen's avatar Lennart Sorensen Committed by David S. Miller
Browse files

drivers: net: cpsw: Fix broken loop condition in switch mode 



0d961b3b (drivers: net: cpsw: fix buggy
loop condition) accidentally fixed a loop comparison in too many places
while fixing a real bug.

It was correct to fix the dual_emac mode section since there 'i' is used
as an index into priv->slaves which is a 0 based array.

However the other two changes (which are only used in switch mode)
are wrong since there 'i' is actually the ALE port number, and port 0
is the host port, while port 1 and up are the slave ports.

Putting the loop condition back in the switch mode section fixes it.

A comment has been added to point out the intent clearly to avoid future
confusion.  Also a comment is fixed that said the opposite of what was
actually happening.

Signed-off-by: default avatarLen Sorensen <lsorense@csclub.uwaterloo.ca>
Acked-by: default avatarHeiko Schocher <hs@denx.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0089b745

drivers/net/ethernet/ti/cpsw.c

+5 −5
Original line number Diff line number Diff line
@@ -591,8 +591,8 @@ static void cpsw_set_promiscious(struct net_device *ndev, bool enable) 
		if (enable) {

			unsigned long timeout = jiffies + HZ;



			/* Disable Learn for all ports */

			for (i = 0; i < priv->data.slaves; i++) {

			/* Disable Learn for all ports (host is port 0 and slaves are port 1 and up */

			for (i = 0; i <= priv->data.slaves; i++) {

				cpsw_ale_control_set(ale, i,

						     ALE_PORT_NOLEARN, 1);

				cpsw_ale_control_set(ale, i,
@@ -616,11 +616,11 @@ static void cpsw_set_promiscious(struct net_device *ndev, bool enable) 
			cpsw_ale_control_set(ale, 0, ALE_P0_UNI_FLOOD, 1);

			dev_dbg(&ndev->dev, "promiscuity enabled\n");

		} else {

			/* Flood All Unicast Packets to Host port */

			/* Don't Flood All Unicast Packets to Host port */

			cpsw_ale_control_set(ale, 0, ALE_P0_UNI_FLOOD, 0);



			/* Enable Learn for all ports */

			for (i = 0; i < priv->data.slaves; i++) {

			/* Enable Learn for all ports (host is port 0 and slaves are port 1 and up */

			for (i = 0; i <= priv->data.slaves; i++) {

				cpsw_ale_control_set(ale, i,

						     ALE_PORT_NOLEARN, 0);

				cpsw_ale_control_set(ale, i,