diff options
| author | Peter Maydell | 2014-04-28 12:29:02 +0200 |
|---|---|---|
| committer | Peter Maydell | 2014-04-28 12:29:03 +0200 |
| commit | d09a18d44d5bc0db10caa97cdd22c70e65adfe01 (patch) | |
| tree | 59888b3319b92c7a8c9c3362c01b0404457b9489 /hw | |
| parent | Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20140425' into staging (diff) | |
| parent | net: Don't use error_is_set() to suppress additional errors (diff) | |
| download | qemu-d09a18d44d5bc0db10caa97cdd22c70e65adfe01.tar.gz qemu-d09a18d44d5bc0db10caa97cdd22c70e65adfe01.tar.xz qemu-d09a18d44d5bc0db10caa97cdd22c70e65adfe01.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging
Net patches
# gpg: Signature made Fri 25 Apr 2014 15:07:31 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:
net: Don't use error_is_set() to suppress additional errors
net: Make qmp_query_rx_filter() with name argument more obvious
net: xilinx_axienet.c: Add phy soft reset bit clearing
net/net.c: Remove unnecessary semicolon
pcnet: remove duplicate assignment
tap: Avoid extra iterations while closing file fd
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/net/pcnet.c | 1 | ||||
| -rw-r--r-- | hw/net/xilinx_axienet.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c index 7cb47b3f1f..ebe505784d 100644 --- a/hw/net/pcnet.c +++ b/hw/net/pcnet.c @@ -718,7 +718,6 @@ static void pcnet_s_reset(PCNetState *s) s->csr[94] = 0x0000; s->csr[100] = 0x0200; s->csr[103] = 0x0105; - s->csr[103] = 0x0105; s->csr[112] = 0x0000; s->csr[114] = 0x0000; s->csr[122] = 0x0000; diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c index 839d97ca86..0f485a0283 100644 --- a/hw/net/xilinx_axienet.c +++ b/hw/net/xilinx_axienet.c @@ -142,6 +142,9 @@ tdk_write(struct PHY *phy, unsigned int req, unsigned int data) phy->regs[regnum] = data; break; } + + /* Unconditionally clear regs[BMCR][BMCR_RESET] */ + phy->regs[0] &= ~0x8000; } static void |