From a104a1475269c0572a5c96fb0382be419de98098 Mon Sep 17 00:00:00 2001 From: Barry Grussling Date: Fri, 24 Jun 2011 19:53:51 +0000 Subject: [PATCH] --- yaml --- r: 255982 b: refs/heads/master c: 81399ec683632b85863b093f4fffe2b4511e49e6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/dsa/mv88e6131.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4cb6d5b3a2d5..5bdbc00ff211 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 864834f935b5311004ebbf0c485dbfd10aa9a546 +refs/heads/master: 81399ec683632b85863b093f4fffe2b4511e49e6 diff --git a/trunk/net/dsa/mv88e6131.c b/trunk/net/dsa/mv88e6131.c index 45f7411e90ba..9bd1061fa4ee 100644 --- a/trunk/net/dsa/mv88e6131.c +++ b/trunk/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