| Message ID | 1308602433-31320-2-git-send-email-barry@grussling.com |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Barry Grussling <barry@grussling.com> Date: Mon, 20 Jun 2011 13:40:33 -0700 > --- > net/dsa/mv88e6131.c | 8 ++++++-- > 1 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/net/dsa/mv88e6131.c b/net/dsa/mv88e6131.c > index 45f7411..1a1d1d1 100644 > --- a/net/dsa/mv88e6131.c > +++ b/net/dsa/mv88e6131.c > @@ -118,10 +118,14 @@ static int mv88e6131_setup_global(struct dsa_switch *ds) > REG_WRITE(REG_GLOBAL, 0x1a, (dsa_upstream_port(ds) * 0x1100) | 0x00f0); > > /* > - * Disable cascade port functionality, and set the switch's > + * Disable cascade port functionality unless this device is > + * used in a cascade configuration, and set the switch's This screws up the formatting, please don't do this. The line is not aligned properly, it uses spaces instead of TAB characters, etc. etc. etc. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/dsa/mv88e6131.c b/net/dsa/mv88e6131.c index 45f7411..1a1d1d1 100644 --- a/net/dsa/mv88e6131.c +++ b/net/dsa/mv88e6131.c @@ -118,10 +118,14 @@ static int mv88e6131_setup_global(struct dsa_switch *ds) REG_WRITE(REG_GLOBAL, 0x1a, (dsa_upstream_port(ds) * 0x1100) | 0x00f0); /* - * Disable cascade port functionality, and set the switch's + * Disable cascade port functionality unless this device is + * used in a cascade configuration, and set the switch's * DSA device number. */ - REG_WRITE(REG_GLOBAL, 0x1c, 0xe000 | (ds->index & 0x1f)); + if (ds->dst->pd->nr_chips > 1) + REG_WRITE(REG_GLOBAL, 0x1c, 0xf000 | (ds->index & 0x1f)); + else + REG_WRITE(REG_GLOBAL, 0x1c, 0xe000 | (ds->index & 0x1f)); /* * Send all frames with destination addresses matching