mbox

[PULL,for-2.4,0/9] Net patches

Message ID 1436272705-28499-1-git-send-email-stefanha@redhat.com
State New
Headers show

Pull-request

git://github.com/stefanha/qemu.git tags/net-pull-request

Message

Stefan Hajnoczi July 7, 2015, 12:38 p.m. UTC 
The following changes since commit f6e3035f75e5c6a73485335765ae070304c7a110:

  Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream-smm' into staging (2015-07-06 23:37:53 +0100)

are available in the git repository at:

  git://github.com/stefanha/qemu.git tags/net-pull-request

for you to fetch changes up to 849729bb796e0ecbb3f370f119682f2821dd1441:

  rocker: tests: don't need to specify master/self when setting vlans (2015-07-07 13:13:22 +0100)

----------------------------------------------------------------

----------------------------------------------------------------

Brian Kress (1):
  vmxnet3: Fix incorrect small packet padding

Gonglei (1):
  rocker: fix memory leak

Scott Feldman (6):
  rocker: don't queue receive pkts when port is disabled
  rocker: fix misplaced break statement
  rocker: fix missing break statements
  rocker: return -1 when dropping packet on ingress
  rocker: mark copy-to-cpu pkts as forwarding offloaded
  rocker: tests: don't need to specify master/self when setting vlans

Stefan Hajnoczi (1):
  e1000: flush packets when link comes up

 docs/specs/rocker.txt         |  4 ++++
 hw/net/e1000.c                |  3 +++
 hw/net/rocker/rocker.c        | 11 +++++++++--
 hw/net/rocker/rocker.h        |  2 +-
 hw/net/rocker/rocker_fp.c     | 18 ++++++++++--------
 hw/net/rocker/rocker_hw.h     |  1 +
 hw/net/rocker/rocker_of_dpa.c |  7 +++++--
 hw/net/rocker/rocker_world.c  |  2 +-
 hw/net/vmxnet3.c              | 12 ++++++------
 tests/rocker/bridge-vlan      |  4 ++--
 tests/rocker/bridge-vlan-stp  |  4 ++--
 11 files changed, 44 insertions(+), 24 deletions(-)

Comments

Peter Maydell July 7, 2015, 3:57 p.m. UTC | #1 
On 7 July 2015 at 13:38, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> The following changes since commit f6e3035f75e5c6a73485335765ae070304c7a110:
>
>   Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream-smm' into staging (2015-07-06 23:37:53 +0100)
>
> are available in the git repository at:
>
>   git://github.com/stefanha/qemu.git tags/net-pull-request
>
> for you to fetch changes up to 849729bb796e0ecbb3f370f119682f2821dd1441:
>
>   rocker: tests: don't need to specify master/self when setting vlans (2015-07-07 13:13:22 +0100)
>

Applied, thanks.

-- PMM