aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-06-03 05:43:41 -0400
committerDavid S. Miller <davem@davemloft.net>2009-06-03 05:43:41 -0400
commitb2f8f7525c8aa1fdd8ad8c72c832dfb571d5f768 (patch)
tree71ae1801d264bca62efa0d22376b49de7f206e9a /drivers/net/e1000
parentd455e5b165a367a628110ec2d18807ea10052cd1 (diff)
parent12186be7d2e1106cede1cc728526e3d7998cbe94 (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/forcedeth.c
Diffstat (limited to 'drivers/net/e1000')
-rw-r--r--drivers/net/e1000/e1000_main.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 74667e521431..05e87a59f1c6 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -4035,8 +4035,9 @@ static bool e1000_clean_rx_irq(struct e1000_adapter *adapter,
4035 PCI_DMA_FROMDEVICE); 4035 PCI_DMA_FROMDEVICE);
4036 4036
4037 length = le16_to_cpu(rx_desc->length); 4037 length = le16_to_cpu(rx_desc->length);
4038 4038 /* !EOP means multiple descriptors were used to store a single
4039 if (unlikely(!(status & E1000_RXD_STAT_EOP))) { 4039 * packet, also make sure the frame isn't just CRC only */
4040 if (unlikely(!(status & E1000_RXD_STAT_EOP) || (length <= 4))) {
4040 /* All receives must fit into a single buffer */ 4041 /* All receives must fit into a single buffer */
4041 E1000_DBG("%s: Receive packet consumed multiple" 4042 E1000_DBG("%s: Receive packet consumed multiple"
4042 " buffers\n", netdev->name); 4043 " buffers\n", netdev->name);