From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38549) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCS9D-0002li-PF for qemu-devel@nongnu.org; Tue, 07 Jul 2015 08:38:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZCS97-00014j-KS for qemu-devel@nongnu.org; Tue, 07 Jul 2015 08:38:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60738) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCS97-00014T-FK for qemu-devel@nongnu.org; Tue, 07 Jul 2015 08:38:45 -0400 From: Stefan Hajnoczi Date: Tue, 7 Jul 2015 13:38:25 +0100 Message-Id: <1436272705-28499-10-git-send-email-stefanha@redhat.com> In-Reply-To: <1436272705-28499-1-git-send-email-stefanha@redhat.com> References: <1436272705-28499-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL for-2.4 9/9] rocker: tests: don't need to specify master/self when setting vlans List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Scott Feldman , Stefan Hajnoczi From: Scott Feldman 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 Message-id: 1435746792-41278-6-git-send-email-sfeldma@gmail.com Signed-off-by: Stefan Hajnoczi --- 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