From: Justin Pettit <jpettit@nicira.com>
Date: Tue, 6 Oct 2009 18:08:31 +0000 (-0700)
Subject: Merge commit 'origin/citrix'
X-Git-Tag: v0.99.0~59
X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=e8b52a913a8fc3d2ef0dae82eda5905668ebfae1

Merge commit 'origin/citrix'
---

e8b52a913a8fc3d2ef0dae82eda5905668ebfae1
diff --cc vswitchd/bridge.c
index ef390f77e,f32d2baff..bece25220
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@@ -3067,9 -2980,22 +3067,22 @@@ port_update_bond_compat(struct port *po
          if (slave->up) {
              bond.up = true;
          }
 -        memcpy(slave->mac, iface->mac, ETH_ADDR_LEN);
 +        netdev_get_etheraddr(iface->netdev, slave->mac);
      }
  
+     if (cfg_get_bool(0, "bonding.%s.fake-iface", port->name)) {
+         struct netdev *bond_netdev;
+ 
+         if (!netdev_open(port->name, NETDEV_ETH_TYPE_NONE, &bond_netdev)) {
+             if (bond.up) {
+                 netdev_turn_flags_on(bond_netdev, NETDEV_UP, true);
+             } else {
+                 netdev_turn_flags_off(bond_netdev, NETDEV_UP, true);
+             }
+             netdev_close(bond_netdev);
+         }
+     }
+ 
      proc_net_compat_update_bond(port->name, &bond);
      free(bond.slaves);
  }