diff options
| author | Peter Maydell | 2017-09-08 13:57:28 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-09-08 13:57:28 +0200 |
| commit | 74bbfe024da80a50dbe51fbb17f219d2f3e4d2dd (patch) | |
| tree | 230aa7af0cb3b30fb825dae675e3e33d474b2994 /hw/net/e1000_regs.h | |
| parent | Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20170907' into staging (diff) | |
| parent | colo-compare: Update the COLO document to add the IOThread configuration (diff) | |
| download | qemu-74bbfe024da80a50dbe51fbb17f219d2f3e4d2dd.tar.gz qemu-74bbfe024da80a50dbe51fbb17f219d2f3e4d2dd.tar.xz qemu-74bbfe024da80a50dbe51fbb17f219d2f3e4d2dd.zip | |
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
# gpg: Signature made Fri 08 Sep 2017 03:00:34 BST
# gpg: using RSA key 0xEF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 215D 46F4 8246 689E C77F 3562 EF04 965B 398D 6211
* remotes/jasowang/tags/net-pull-request:
colo-compare: Update the COLO document to add the IOThread configuration
colo-compare: Use IOThread to Check old packet regularly and Process pactkets of the primary
qemu-iothread: IOThread supports the GMainContext event loop
net/colo-compare.c: Fix comments and scheme
net/colo-compare.c: Adjust net queue pop order for performance
net/colo-compare.c: Optimize unpredictable tcp options comparison
e1000: Rename the SEC symbol to SEQEC
net/socket: Improve -net socket error reporting
net/net: Convert parse_host_port() to Error
net/socket: Convert several helper functions to Error
net/socket: Don't treat odd socket type as SOCK_STREAM
MAINTAINERS: Update mail address for COLO Proxy
net: rtl8139: do not use old_mmio accesses
net/rocker: Fix the unusual macro name
net/rocker: Convert to realize()
net/rocker: Plug memory leak in pci_rocker_init()
net/rocker: Remove the dead error handling
net/filter-rewriter.c: Fix rewirter checksum bug when use virtio-net
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/net/e1000_regs.h')
| -rw-r--r-- | hw/net/e1000_regs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/net/e1000_regs.h b/hw/net/e1000_regs.h index 23eed50b9c..ae99f58bab 100644 --- a/hw/net/e1000_regs.h +++ b/hw/net/e1000_regs.h @@ -260,7 +260,7 @@ #define E1000_COLC 0x04028 /* Collision Count - R/clr */ #define E1000_DC 0x04030 /* Defer Count - R/clr */ #define E1000_TNCRS 0x04034 /* TX-No CRS - R/clr */ -#define E1000_SEC 0x04038 /* Sequence Error Count - R/clr */ +#define E1000_SEQEC 0x04038 /* Sequence Error Count - R/clr */ #define E1000_CEXTERR 0x0403C /* Carrier Extension Error Count - R/clr */ #define E1000_RLEC 0x04040 /* Receive Length Error Count - R/clr */ #define E1000_XONRXC 0x04048 /* XON RX Count - R/clr */ |