diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-07-07 15:48:49 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-07-07 15:48:49 +0100 |
| commit | f2562fbb7ac54d597cfe05f613d30296d1850d1b (patch) | |
| tree | 56188fa8a999e5c40faf14ebe9fb82b194109f44 /tests | |
| parent | aeb72188e073d515e1f5a80f6b603692a396477b (diff) | |
| parent | 849729bb796e0ecbb3f370f119682f2821dd1441 (diff) | |
| download | qemu-f2562fbb7ac54d597cfe05f613d30296d1850d1b.tar.gz qemu-f2562fbb7ac54d597cfe05f613d30296d1850d1b.tar.bz2 qemu-f2562fbb7ac54d597cfe05f613d30296d1850d1b.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging
# gpg: Signature made Tue Jul 7 13:38:13 2015 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
* remotes/stefanha/tags/net-pull-request:
rocker: tests: don't need to specify master/self when setting vlans
rocker: mark copy-to-cpu pkts as forwarding offloaded
rocker: return -1 when dropping packet on ingress
rocker: fix missing break statements
rocker: fix misplaced break statement
rocker: don't queue receive pkts when port is disabled
vmxnet3: Fix incorrect small packet padding
e1000: flush packets when link comes up
rocker: fix memory leak
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/rocker/bridge-vlan | 4 | ||||
| -rwxr-xr-x | 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 ef9e5f53bb..897d82c5c7 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 c660312bc6..85d2646820 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 |