From: Peter Maydell Date: Tue, 7 Jul 2015 14:48:49 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging X-Git-Tag: v2.4.0-rc0~16 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f2562fbb7ac54d597cfe05f613d30296d1850d1b;p=thirdparty%2Fqemu.git 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 " # gpg: aka "Stefan Hajnoczi " * 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 --- f2562fbb7ac54d597cfe05f613d30296d1850d1b