aboutsummaryrefslogtreecommitdiff
path: root/tests/rocker
diff options
context:
space:
mode:
authorScott Feldman <sfeldma@gmail.com>2015-07-01 03:33:12 -0700
committerStefan Hajnoczi <stefanha@redhat.com>2015-07-07 13:13:22 +0100
commit849729bb796e0ecbb3f370f119682f2821dd1441 (patch)
tree9f3d48dc0cf5487ae7f6dfa2e2cb970e06e4ecf2 /tests/rocker
parentd0d2555852c5e684a97dce787d3c2a65b9a6d64c (diff)
downloadqemu-849729bb796e0ecbb3f370f119682f2821dd1441.zip
qemu-849729bb796e0ecbb3f370f119682f2821dd1441.tar.gz
qemu-849729bb796e0ecbb3f370f119682f2821dd1441.tar.bz2
rocker: tests: don't need to specify master/self when setting vlans
4.1 Linux kernel doesn't require specifying "master" or "self" when setting vlans on a port, so clean these up from the tests that use vlans. Signed-off-by: Scott Feldman <sfeldma@gmail.com> Message-id: 1435746792-41278-6-git-send-email-sfeldma@gmail.com Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'tests/rocker')
-rwxr-xr-xtests/rocker/bridge-vlan4
-rwxr-xr-xtests/rocker/bridge-vlan-stp4
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/rocker/bridge-vlan b/tests/rocker/bridge-vlan
index ef9e5f5..897d82c 100755
--- a/tests/rocker/bridge-vlan
+++ b/tests/rocker/bridge-vlan
@@ -20,8 +20,8 @@ simp ssh tut sw1 --cmd "echo 1 | sudo dd of=/sys/class/net/br0/bridge/vlan_filte
# add both ports to VLAN 57
-simp ssh tut sw1 --cmd "sudo /sbin/bridge vlan add vid 57 dev sw1p1 master self"
-simp ssh tut sw1 --cmd "sudo /sbin/bridge vlan add vid 57 dev sw1p2 master self"
+simp ssh tut sw1 --cmd "sudo /sbin/bridge vlan add vid 57 dev sw1p1"
+simp ssh tut sw1 --cmd "sudo /sbin/bridge vlan add vid 57 dev sw1p2"
# turn off learning and flooding in SW
diff --git a/tests/rocker/bridge-vlan-stp b/tests/rocker/bridge-vlan-stp
index c660312..85d2646 100755
--- a/tests/rocker/bridge-vlan-stp
+++ b/tests/rocker/bridge-vlan-stp
@@ -21,8 +21,8 @@ simp ssh tut sw1 --cmd "echo 1 | sudo dd of=/sys/class/net/br0/bridge/vlan_filte
# add both ports to VLAN 57
-simp ssh tut sw1 --cmd "sudo /sbin/bridge vlan add vid 57 dev sw1p1 master self"
-simp ssh tut sw1 --cmd "sudo /sbin/bridge vlan add vid 57 dev sw1p2 master self"
+simp ssh tut sw1 --cmd "sudo /sbin/bridge vlan add vid 57 dev sw1p1"
+simp ssh tut sw1 --cmd "sudo /sbin/bridge vlan add vid 57 dev sw1p2"
# turn off learning and flooding in SW