48 lines
1.7 KiB
Diff
48 lines
1.7 KiB
Diff
|
From: "Michael S. Tsirkin" <mst@redhat.com>
|
||
|
|
Date: Mon, 12 Jul 2010 20:41:02 +0300
|
||
|
|
Subject: e1000: secrc support
|
||
|
|
Patch-mainline: v0.13.0-rc0
|
||
|
|
Git-commit: 55e8d1ce6b09300cc5f3adcd9a705156d168381d
|
||
|
|
References: bnc#840196
|
||
|
|
|
||
|
|
Add support for secrc field. Reportedly needed by old RHEL guests.
|
||
|
|
|
||
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
||
|
|
Acked-by: Michal Kubecek <mkubecek@suse.cz>
|
||
|
|
---
|
||
|
|
tools/qemu-xen-traditional-dir-remote/hw/e1000.c | 11 ++++++++++-
|
||
|
|
1 file changed, 10 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/tools/qemu-xen-traditional-dir-remote/hw/e1000.c b/tools/qemu-xen-traditional-dir-remote/hw/e1000.c
|
||
|
|
index 9b062db..07e681d 100644
|
||
|
|
--- a/tools/qemu-xen-traditional-dir-remote/hw/e1000.c
|
||
|
|
+++ b/tools/qemu-xen-traditional-dir-remote/hw/e1000.c
|
||
|
|
@@ -338,6 +338,15 @@ is_vlan_txd(uint32_t txd_lower)
|
||
|
|
return ((txd_lower & E1000_TXD_CMD_VLE) != 0);
|
||
|
|
}
|
||
|
|
|
||
|
|
+/* FCS aka Ethernet CRC-32. We don't get it from backends and can't
|
||
|
|
+ * fill it in, just pad descriptor length by 4 bytes unless guest
|
||
|
|
+ * told us to trip it off the packet. */
|
||
|
|
+static inline int
|
||
|
|
+fcs_len(E1000State *s)
|
||
|
|
+{
|
||
|
|
+ return (s->mac_reg[RCTL] & E1000_RCTL_SECRC) ? 0 : 4;
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
static void
|
||
|
|
xmit_seg(E1000State *s)
|
||
|
|
{
|
||
|
|
@@ -672,7 +681,7 @@ e1000_receive(void *opaque, const uint8_t *buf, int size)
|
||
|
|
if (desc.buffer_addr) {
|
||
|
|
cpu_physical_memory_write(le64_to_cpu(desc.buffer_addr),
|
||
|
|
(void *)(buf + vlan_offset), size);
|
||
|
|
- desc.length = cpu_to_le16(size + 4 /* for FCS */);
|
||
|
|
+ desc.length = cpu_to_le16(size + fcs_len(s));
|
||
|
|
desc.status |= E1000_RXD_STAT_EOP|E1000_RXD_STAT_IXSM;
|
||
|
|
} else // as per intel docs; skip descriptors with null buf addr
|
||
|
|
DBGOUT(RX, "Null RX descriptor!!\n");
|
||
|
|
--
|
||
|
|
1.8.1.4
|
||
|
|
|