Corresponds to the upstream commit http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=42061b2a5b79d44c0ff9442a8203f0c7672ee9cf

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>

diff -r 695a855ded8a -r 3a082f7e7e41 scripts/InterfaceReconfigureVswitch.py
--- a/scripts/InterfaceReconfigureVswitch.py	Tue Jan 12 14:12:36 2010 +0000
+++ b/scripts/InterfaceReconfigureVswitch.py	Tue Jan 12 14:12:36 2010 +0000
@@ -171,7 +171,8 @@
     return ['--del-match=bridge.*.port=%s' % interface,
             '--del-match=port.%s.[!0-9]*' % interface,
             '--del-match=iface.%s.[!0-9]*' % interface,
-            '--del-match=vlan.%s.[!0-9]*' % interface]
+            '--del-match=vlan.%s.trunks=*' % interface,
+            '--del-match=vlan.%s.tag=*' % interface]
 
 def datapath_modify_config(commands):
     #log("modifying configuration:")
diff -r 695a855ded8a -r 3a082f7e7e41 scripts/vif
--- a/scripts/vif	Tue Jan 12 14:12:36 2010 +0000
+++ b/scripts/vif	Tue Jan 12 14:12:36 2010 +0000
@@ -133,7 +133,8 @@
 
 	    $cfg_mod -F /etc/ovs-vswitchd.conf \
 		--del-match="bridge.*.port=${dev}" \
-		--del-match="vlan.${dev}.[!0-9]*" \
+		--del-match="vlan.${dev}.trunks=*" \
+		--del-match="vlan.${dev}.tag=*" \
 		--del-match="port.${dev}.[!0-9]*" \
 		--add="bridge.$bridge.port=${dev}" \
 		$vid $vif_details -c 
@@ -153,7 +154,8 @@
 	vswitch)
 	    $cfg_mod -vANY:console:emer -F /etc/ovs-vswitchd.conf \
 		--del-match="bridge.*.port=${dev}" \
-		--del-match="vlan.${dev}.[!0-9]*" \
+		--del-match="vlan.${dev}.trunks=*" \
+		--del-match="vlan.${dev}.tag=*" \
 		--del-match="port.${dev}.[!0-9]*" -c
 	    $service vswitch reload
 	    ;;