Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

0d961b3b52f566f823070ce2366511a7f64b928c (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: Len Sorensen <lsorense@csclub.uwaterloo.ca>
Acked-by: Heiko Schocher <hs@denx.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Lennart Sorensen and committed by
David S. Miller
35532c21 0089b745

+5 -5
+5 -5
drivers/net/ethernet/ti/cpsw.c
··· 591 591 if (enable) { 592 592 unsigned long timeout = jiffies + HZ; 593 593 594 - /* Disable Learn for all ports */ 595 - for (i = 0; i < priv->data.slaves; i++) { 594 + /* Disable Learn for all ports (host is port 0 and slaves are port 1 and up */ 595 + for (i = 0; i <= priv->data.slaves; i++) { 596 596 cpsw_ale_control_set(ale, i, 597 597 ALE_PORT_NOLEARN, 1); 598 598 cpsw_ale_control_set(ale, i, ··· 616 616 cpsw_ale_control_set(ale, 0, ALE_P0_UNI_FLOOD, 1); 617 617 dev_dbg(&ndev->dev, "promiscuity enabled\n"); 618 618 } else { 619 - /* Flood All Unicast Packets to Host port */ 619 + /* Don't Flood All Unicast Packets to Host port */ 620 620 cpsw_ale_control_set(ale, 0, ALE_P0_UNI_FLOOD, 0); 621 621 622 - /* Enable Learn for all ports */ 623 - for (i = 0; i < priv->data.slaves; i++) { 622 + /* Enable Learn for all ports (host is port 0 and slaves are port 1 and up */ 623 + for (i = 0; i <= priv->data.slaves; i++) { 624 624 cpsw_ale_control_set(ale, i, 625 625 ALE_PORT_NOLEARN, 0); 626 626 cpsw_ale_control_set(ale, i,