39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
|
From e603b5632a4c4eb95bc7dd9c70f1fe7822a87da9 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Michael Contreras <michael@inetric.com>
|
||
|
|
Date: Wed, 5 Dec 2012 13:31:30 -0500
|
||
|
|
Subject: [PATCH] e1000: Discard oversized packets based on SBP|LPE
|
||
|
|
|
||
|
|
Discard packets longer than 16384 when !SBP to match the hardware behavior.
|
||
|
|
|
||
|
|
Signed-off-by: Michael Contreras <michael@inetric.com>
|
||
|
|
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||
|
|
---
|
||
|
|
hw/e1000.c | 7 +++++--
|
||
|
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hw/e1000.c b/hw/e1000.c
|
||
|
|
index 37d207e..a5e67a8 100644
|
||
|
|
--- a/hw/e1000.c
|
||
|
|
+++ b/hw/e1000.c
|
||
|
|
@@ -61,6 +61,8 @@ static int debugflags = DBGBIT(TXERR) | DBGBIT(GENERAL);
|
||
|
|
|
||
|
|
/* this is the size past which hardware will drop packets when setting LPE=0 */
|
||
|
|
#define MAXIMUM_ETHERNET_VLAN_SIZE 1522
|
||
|
|
+/* this is the size past which hardware will drop packets when setting LPE=1 */
|
||
|
|
+#define MAXIMUM_ETHERNET_LPE_SIZE 16384
|
||
|
|
|
||
|
|
/*
|
||
|
|
* HW models:
|
||
|
|
@@ -697,8 +699,9 @@ e1000_receive(VLANClientState *nc, const uint8_t *buf, size_t size)
|
||
|
|
}
|
||
|
|
|
||
|
|
/* Discard oversized packets if !LPE and !SBP. */
|
||
|
|
- if (size > MAXIMUM_ETHERNET_VLAN_SIZE
|
||
|
|
- && !(s->mac_reg[RCTL] & E1000_RCTL_LPE)
|
||
|
|
+ if ((size > MAXIMUM_ETHERNET_LPE_SIZE ||
|
||
|
|
+ (size > MAXIMUM_ETHERNET_VLAN_SIZE
|
||
|
|
+ && !(s->mac_reg[RCTL] & E1000_RCTL_LPE)))
|
||
|
|
&& !(s->mac_reg[RCTL] & E1000_RCTL_SBP)) {
|
||
|
|
return size;
|
||
|
|
}
|