[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL for-2.4 9/9] rocker: tests: don't need to specify mas
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL for-2.4 9/9] rocker: tests: don't need to specify master/self when setting vlans |
Date: |
Tue, 7 Jul 2015 13:38:25 +0100 |
From: Scott Feldman <address@hidden>
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 <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
tests/rocker/bridge-vlan | 4 ++--
tests/rocker/bridge-vlan-stp | 4 ++--
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
--
2.4.3
- [Qemu-devel] [PULL for-2.4 0/9] Net patches, Stefan Hajnoczi, 2015/07/07
- [Qemu-devel] [PULL for-2.4 1/9] rocker: fix memory leak, Stefan Hajnoczi, 2015/07/07
- [Qemu-devel] [PULL for-2.4 2/9] e1000: flush packets when link comes up, Stefan Hajnoczi, 2015/07/07
- [Qemu-devel] [PULL for-2.4 3/9] vmxnet3: Fix incorrect small packet padding, Stefan Hajnoczi, 2015/07/07
- [Qemu-devel] [PULL for-2.4 4/9] rocker: don't queue receive pkts when port is disabled, Stefan Hajnoczi, 2015/07/07
- [Qemu-devel] [PULL for-2.4 5/9] rocker: fix misplaced break statement, Stefan Hajnoczi, 2015/07/07
- [Qemu-devel] [PULL for-2.4 6/9] rocker: fix missing break statements, Stefan Hajnoczi, 2015/07/07
- [Qemu-devel] [PULL for-2.4 7/9] rocker: return -1 when dropping packet on ingress, Stefan Hajnoczi, 2015/07/07
- [Qemu-devel] [PULL for-2.4 8/9] rocker: mark copy-to-cpu pkts as forwarding offloaded, Stefan Hajnoczi, 2015/07/07
- [Qemu-devel] [PULL for-2.4 9/9] rocker: tests: don't need to specify master/self when setting vlans,
Stefan Hajnoczi <=
- Re: [Qemu-devel] [PULL for-2.4 0/9] Net patches, Peter Maydell, 2015/07/07