| Message ID | 1427937719-11630-2-git-send-email-andrew@lunn.ch |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On 04/01/2015 06:21 PM, Andrew Lunn wrote: > From: Guenter Roeck <linux@roeck-us.net> > > Common initialization functions will be needed to enable > HW bridging support. > > Signed-off-by: Guenter Roeck <linux@roeck-us.net> > Reviewed-by: Andrew Lunn <andrew@lunn.ch> Hi Andrew, No idea how David handles this, but I would have expected to see your Signed-off-by: here to reflect the submit path. Thanks, Guenter -- 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
On Wed, Apr 01, 2015 at 06:39:35PM -0700, Guenter Roeck wrote: > On 04/01/2015 06:21 PM, Andrew Lunn wrote: > >From: Guenter Roeck <linux@roeck-us.net> > > > >Common initialization functions will be needed to enable > >HW bridging support. > > > >Signed-off-by: Guenter Roeck <linux@roeck-us.net> > >Reviewed-by: Andrew Lunn <andrew@lunn.ch> > > Hi Andrew, > > No idea how David handles this, but I would have expected to see your > Signed-off-by: here to reflect the submit path. Humm, yes. David, do you want a respin with added Signed-off-by from me for the patches Guenter authored? Andrew -- 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
From: Guenter Roeck <linux@roeck-us.net> Date: Wed, 01 Apr 2015 18:39:35 -0700 > On 04/01/2015 06:21 PM, Andrew Lunn wrote: >> From: Guenter Roeck <linux@roeck-us.net> >> >> Common initialization functions will be needed to enable >> HW bridging support. >> >> Signed-off-by: Guenter Roeck <linux@roeck-us.net> >> Reviewed-by: Andrew Lunn <andrew@lunn.ch> > > Hi Andrew, > > No idea how David handles this, but I would have expected to see your > Signed-off-by: here to reflect the submit path. Agreed, Andrew should be signing off on this. -- 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
From: Andrew Lunn <andrew@lunn.ch> Date: Thu, 2 Apr 2015 03:51:56 +0200 > David, do you want a respin with added Signed-off-by from me for the > patches Guenter authored? Yes. -- 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/drivers/net/dsa/mv88e6131.c b/drivers/net/dsa/mv88e6131.c index 2540ef0142af..0252d51c0a74 100644 --- a/drivers/net/dsa/mv88e6131.c +++ b/drivers/net/dsa/mv88e6131.c @@ -208,28 +208,6 @@ static int mv88e6131_setup_port(struct dsa_switch *ds, int p) val |= 0x0100; REG_WRITE(addr, 0x04, val); - /* Port Control 1: disable trunking. Also, if this is the - * CPU port, enable learn messages to be sent to this port. - */ - REG_WRITE(addr, 0x05, dsa_is_cpu_port(ds, p) ? 0x8000 : 0x0000); - - /* Port based VLAN map: give each port its own address - * database, allow the CPU port to talk to each of the 'real' - * ports, and allow each of the 'real' ports to only talk to - * the upstream port. - */ - val = (p & 0xf) << 12; - if (dsa_is_cpu_port(ds, p)) - val |= ds->phys_port_mask; - else - val |= 1 << dsa_upstream_port(ds); - REG_WRITE(addr, 0x06, val); - - /* Default VLAN ID and priority: don't set a default VLAN - * ID, and set the default packet priority to zero. - */ - REG_WRITE(addr, 0x07, 0x0000); - /* Port Control 2: don't force a good FCS, don't use * VLAN-based, source address-based or destination * address-based priority overrides, don't let the switch @@ -278,20 +256,19 @@ static int mv88e6131_setup_port(struct dsa_switch *ds, int p) */ REG_WRITE(addr, 0x19, 0x7654); - return 0; + return mv88e6xxx_setup_port_common(ds, p); } static int mv88e6131_setup(struct dsa_switch *ds) { - struct mv88e6xxx_priv_state *ps = ds_to_priv(ds); int i; int ret; - mutex_init(&ps->smi_mutex); - mv88e6xxx_ppu_state_init(ds); - mutex_init(&ps->stats_mutex); + ret = mv88e6xxx_setup_common(ds); + if (ret < 0) + return ret; - ps->id = REG_READ(REG_PORT(0), 0x03) & 0xfff0; + mv88e6xxx_ppu_state_init(ds); ret = mv88e6131_switch_reset(ds); if (ret < 0)