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/xilinx_ethlite.c | |
| parent | 5dfc05cb1d342f081df7009703559b29dadc33e9 (diff) | |
| parent | 7efea763772c815ad6220d5ea7a46447329f6015 (diff) | |
| download | focaccia-qemu-4a331bb33bdf112ba95470e5d6ea3561b049c280.tar.gz focaccia-qemu-4a331bb33bdf112ba95470e5d6ea3561b049c280.zip | |
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/xilinx_ethlite.c')
| -rw-r--r-- | hw/net/xilinx_ethlite.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/net/xilinx_ethlite.c b/hw/net/xilinx_ethlite.c index 5a434f642d..1b177b3dae 100644 --- a/hw/net/xilinx_ethlite.c +++ b/hw/net/xilinx_ethlite.c @@ -196,8 +196,9 @@ static ssize_t eth_rx(NetClientState *nc, const uint8_t *buf, size_t size) memcpy(&s->regs[rxbase + R_RX_BUF0], buf, size); s->regs[rxbase + R_RX_CTRL0] |= CTRL_S; - if (s->regs[rxbase + R_RX_CTRL0] & CTRL_I) + if (s->regs[R_RX_CTRL0] & CTRL_I) { eth_pulse_irq(s); + } /* If c_rx_pingpong was set flip buffers. */ s->rxbuf ^= s->c_rx_pingpong; |