From: sfeldma@gmail.com
To: qemu-devel@nongnu.org
Cc: pbonzini@redhat.com, jiri@resnulli.us, stefanha@redhat.com
Subject: [Qemu-devel] [PATCH 5/5] rocker: tests: don't need to specify master/self when setting vlans
Date: Wed, 1 Jul 2015 03:33:12 -0700 [thread overview]
Message-ID: <1435746792-41278-6-git-send-email-sfeldma@gmail.com> (raw)
In-Reply-To: <1435746792-41278-1-git-send-email-sfeldma@gmail.com>
From: Scott Feldman <sfeldma@gmail.com>
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>
---
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
--
1.7.10.4
next prev parent reply other threads:[~2015-07-01 10:31 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-01 10:33 [Qemu-devel] [PATCH 0/5] rocker device updates sfeldma
2015-07-01 10:33 ` [Qemu-devel] [PATCH 1/5] rocker: fix misplaced break statement sfeldma
2015-07-01 10:33 ` [Qemu-devel] [PATCH 2/5] rocker: fix missing break statements sfeldma
2015-07-01 10:33 ` [Qemu-devel] [PATCH 3/5] rocker: return -1 when dropping packet on ingress sfeldma
2015-07-01 10:33 ` [Qemu-devel] [PATCH 4/5] rocker: mark copy-to-cpu pkts as forwarding offloaded sfeldma
2015-07-01 10:33 ` sfeldma [this message]
2015-07-02 14:27 ` [Qemu-devel] [PATCH 0/5] rocker device updates Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1435746792-41278-6-git-send-email-sfeldma@gmail.com \
--to=sfeldma@gmail.com \
--cc=jiri@resnulli.us \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).