diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-06-09 15:00:21 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-06-09 15:00:21 +0100 |
| commit | 4a331bb33bdf112ba95470e5d6ea3561b049c280 (patch) | |
| tree | 02ceecff81d33e73b19fd2dc38eb7a8e78a19ea2 /hw/net/vmxnet3.c | |
| parent | 5dfc05cb1d342f081df7009703559b29dadc33e9 (diff) | |
| parent | 7efea763772c815ad6220d5ea7a46447329f6015 (diff) | |
Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging
Net patches
# gpg: Signature made Mon 09 Jun 2014 14:41:34 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:
e1000: remove broken support for 82573L
tests: e1000: test additional device IDs
e1000: allow command-line selection of card model
vmxnet3: fix msix vectors unuse
net: xilinx_ethlite: Fix Rx-pong interrupt
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/net/vmxnet3.c')
| -rw-r--r-- | hw/net/vmxnet3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c index 1bb9259df2..f3be4940e1 100644 --- a/hw/net/vmxnet3.c +++ b/hw/net/vmxnet3.c @@ -2050,7 +2050,7 @@ vmxnet3_cleanup_msix(VMXNET3State *s) PCIDevice *d = PCI_DEVICE(s); if (s->msix_used) { - msix_vector_unuse(d, VMXNET3_MAX_INTRS); + vmxnet3_unuse_msix_vectors(s, VMXNET3_MAX_INTRS); msix_uninit(d, &s->msix_bar, &s->msix_bar); } } |