diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2023-11-20 05:22:30 -0500 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2023-11-20 05:22:31 -0500 |
| commit | 95e008b9ddcd9756ee49a17dd3c25dedb295d51f (patch) | |
| tree | d45d6bcf2ff6bee965a270b1aefd5de3126009be /hw/net/cadence_gem.c | |
| parent | 34a5cb6d8434303c170230644b2a7c1d5781d197 (diff) | |
| parent | f779357882b4758551ff30074b4b915d7d249d3d (diff) | |
| download | focaccia-qemu-95e008b9ddcd9756ee49a17dd3c25dedb295d51f.tar.gz focaccia-qemu-95e008b9ddcd9756ee49a17dd3c25dedb295d51f.zip | |
Merge tag 'pull-trivial-patches' of https://gitlab.com/mjt0k/qemu into staging
trivial patches for 2023-11-16 # -----BEGIN PGP SIGNATURE----- # # iQFDBAABCAAtFiEEe3O61ovnosKJMUsicBtPaxppPlkFAmVVxz4PHG1qdEB0bHMu # bXNrLnJ1AAoJEHAbT2saaT5ZI+cH+wexpGPHmmWHaA0moo+1MZPC3pbEvOXq184b # oeGRUidq89380DzsxkIxrDn98KisKnIX3oGZ56Q394Ntg7J2xyFN/KsvQhzpElSb # 01Ws90NVoHIXoXZKNIOFZXkqOLCB+kwqZ1PFiYwALEJkEPBfpV40dTWuyCnxh1D8 # lKHtk5bLKzDbTmDYYfnZ7zkP6CLMhRH7A7evdb/4+W+phbqTHeKbSgq8QhNvVX8n # 38yzPTQPlMyXHw7Psio62N7wz86wEiGkYELud1nPPlA902paM5FHMdjYBohm/ZCM # 4E12gzMg4SgwBIsWoyE/1tUAjyJXeChocxOVLFqDXXaiYgomAh0= # =x0bq # -----END PGP SIGNATURE----- # gpg: Signature made Thu 16 Nov 2023 02:39:42 EST # gpg: using RSA key 7B73BAD68BE7A2C289314B22701B4F6B1A693E59 # gpg: issuer "mjt@tls.msk.ru" # gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>" [full] # gpg: aka "Michael Tokarev <mjt@corpit.ru>" [full] # gpg: aka "Michael Tokarev <mjt@debian.org>" [full] # Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D 4324 457C E0A0 8044 65C5 # Subkey fingerprint: 7B73 BAD6 8BE7 A2C2 8931 4B22 701B 4F6B 1A69 3E59 * tag 'pull-trivial-patches' of https://gitlab.com/mjt0k/qemu: (27 commits) util/range.c: spelling fix: inbetween util/filemonitor-inotify.c: spelling fix: kenel tests/qtest/ufs-test.c: spelling fix: tranfer tests/qtest/migration-test.c: spelling fix: bandwith target/riscv/cpu.h: spelling fix: separatly include/hw/virtio/vhost.h: spelling fix: sate include/hw/hyperv/dynmem-proto.h: spelling fix: nunber, atleast include/block/ufs.h: spelling fix: setted hw/net/cadence_gem.c: spelling fixes: Octects hw/mem/memory-device.c: spelling fix: ontaining contrib/vhost-user-gpu/virgl.c: spelling fix: mesage migration/rdma.c: spelling fix: asume target/hppa: spelling fixes: Indicies, Truely target/arm/tcg: spelling fixes: alse, addreses docs/system/arm/emulation.rst: spelling fix: Enhacements docs/devel/migration.rst: spelling fixes: doen't, diferent, responsability, recomend docs/about/deprecated.rst: spelling fix: becase gdbstub: spelling fix: respectivelly hw/cxl: spelling fixes: limitaions, potentialy, intialized linux-user: spelling fixes: othe, necesary ... Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'hw/net/cadence_gem.c')
| -rw-r--r-- | hw/net/cadence_gem.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c index 5b989f5b52..19adbc0e19 100644 --- a/hw/net/cadence_gem.c +++ b/hw/net/cadence_gem.c @@ -225,8 +225,8 @@ REG32(WOLAN, 0xb8) /* Wake on LAN reg */ REG32(IPGSTRETCH, 0xbc) /* IPG Stretch reg */ REG32(SVLAN, 0xc0) /* Stacked VLAN reg */ REG32(MODID, 0xfc) /* Module ID reg */ -REG32(OCTTXLO, 0x100) /* Octects transmitted Low reg */ -REG32(OCTTXHI, 0x104) /* Octects transmitted High reg */ +REG32(OCTTXLO, 0x100) /* Octets transmitted Low reg */ +REG32(OCTTXHI, 0x104) /* Octets transmitted High reg */ REG32(TXCNT, 0x108) /* Error-free Frames transmitted */ REG32(TXBCNT, 0x10c) /* Error-free Broadcast Frames */ REG32(TXMCNT, 0x110) /* Error-free Multicast Frame */ @@ -245,8 +245,8 @@ REG32(EXCESSCOLLCNT, 0x140) /* Excessive Collision Frames */ REG32(LATECOLLCNT, 0x144) /* Late Collision Frames */ REG32(DEFERTXCNT, 0x148) /* Deferred Transmission Frames */ REG32(CSENSECNT, 0x14c) /* Carrier Sense Error Counter */ -REG32(OCTRXLO, 0x150) /* Octects Received register Low */ -REG32(OCTRXHI, 0x154) /* Octects Received register High */ +REG32(OCTRXLO, 0x150) /* Octets Received register Low */ +REG32(OCTRXHI, 0x154) /* Octets Received register High */ REG32(RXCNT, 0x158) /* Error-free Frames Received */ REG32(RXBROADCNT, 0x15c) /* Error-free Broadcast Frames RX */ REG32(RXMULTICNT, 0x160) /* Error-free Multicast Frames RX */ |