- system ("/usr/sbin/brctl addif $newbridge $iface") == 0 ||
- die "can't add interface to bridge\n";
+ if (-d "/sys/class/net/$bridge/bridge") {
+ my $newbridge = activate_bridge_vlan($bridge, $tag);
+ copy_bridge_config($bridge, $newbridge) if $bridge ne $newbridge;
+
+ system("/sbin/brctl addif $newbridge $iface") == 0 ||
+ die "can't add interface to bridge\n";
+ } else {
+ my $cmd = "/usr/bin/ovs-vsctl add-port $bridge $iface";
+ $cmd .= " tag=$tag" if $tag;
+ system($cmd) == 0 ||
+ die "can't add interface to bridge\n";
+ }
+}
+
+sub tap_unplug {
+ my ($iface, $bridge, $tag) = @_;
+
+ if (-d "/sys/class/net/$bridge/bridge") {
+ $bridge .= "v$tag" if $tag;
+
+ system("/sbin/brctl delif $bridge $iface") == 0 ||
+ die "can't del interface from bridge\n";
+ } else {
+ system ("/usr/bin/ovs-vsctl del-port $iface") == 0 ||
+ die "can't del interface from bridge\n";
+ }