Thanks, I pushed this to "master" and "branch-1.4".
On Mon, Dec 12, 2011 at 01:09:02PM -0800, Justin Pettit wrote:
> Looks good.
>
> --Justin
>
>
> On Dec 12, 2011, at 11:10 AM, Ben Pfaff wrote:
>
> > Since Open vSwitch's inception we've disabled the use of bonds as access
> > ports, for no particularly good reason. This also unintentionally
> > prevented bonds from being used as native VLAN ports.
> >
> > This commit removes the code that prevented using bonds these ways
> >
> > Reported-by: "Michael A. Collins" <mike.a.coll...@ark-net.org>
> > Signed-off-by: Ben Pfaff <b...@nicira.com>
> > ---
> > AUTHORS | 1 +
> > vswitchd/bridge.c | 13 ++-----------
> > 2 files changed, 3 insertions(+), 11 deletions(-)
> >
> > diff --git a/AUTHORS b/AUTHORS
> > index 9e0ac22..8af74e4 100644
> > --- a/AUTHORS
> > +++ b/AUTHORS
> > @@ -93,6 +93,7 @@ John Galgay j...@galgay.net
> > Koichi Yagishita yagishita.koi...@jrc.co.jp
> > Krishna Miriyala kris...@nicira.com
> > Luiz Henrique Ozaki luiz.oz...@gmail.com
> > +Michael A. Collins mike.a.coll...@ark-net.org
> > Michael Hu m...@nicira.com
> > Michael Mao m...@nicira.com
> > Mike Bursell mike.burs...@citrix.com
> > diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
> > index adf01f7..de773f6 100644
> > --- a/vswitchd/bridge.c
> > +++ b/vswitchd/bridge.c
> > @@ -539,17 +539,8 @@ port_configure(struct port *port)
> >
> > /* Get VLAN tag. */
> > s.vlan = -1;
> > - if (cfg->tag) {
> > - if (list_is_short(&port->ifaces)) {
> > - if (*cfg->tag >= 0 && *cfg->tag <= 4095) {
> > - s.vlan = *cfg->tag;
> > - }
> > - } else {
> > - /* It's possible that bonded, VLAN-tagged ports make sense.
> > Maybe
> > - * they even work as-is. But they have not been tested. */
> > - VLOG_WARN("port %s: VLAN tags not supported on bonded ports",
> > - port->name);
> > - }
> > + if (cfg->tag && *cfg->tag >= 0 && *cfg->tag <= 4095) {
> > + s.vlan = *cfg->tag;
> > }
> >
> > /* Get VLAN trunks. */
> > --
> > 1.7.4.4
> >
> > _______________________________________________
> > dev mailing list
> > dev@openvswitch.org
> > http://openvswitch.org/mailman/listinfo/dev
>
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
