From 08823d0034b3b84323edb15bd0848643cab4c17d Mon Sep 17 00:00:00 2001
From: Ron Mercer <ron.mercer@qlogic.com>
Date: Tue, 9 Jun 2009 05:39:28 +0000
Subject: [PATCH] --- yaml --- r: 150787 b: refs/heads/master c:
 ec33a49135d96df56ef106a49c2434ca81f821f9 h: refs/heads/master i:   150785:
 b10dc52faff6d4db6423b4866f038a871ac92fd3   150783:
 3130ca73baf254a2e7c5b680b9f1c3f56b38cdbe v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/net/qlge/qlge_main.c | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index cd94a83b0092..ac6a7e832d83 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a32959cd9df77423c8b375119ee7f135ff302bc1
+refs/heads/master: ec33a49135d96df56ef106a49c2434ca81f821f9
diff --git a/trunk/drivers/net/qlge/qlge_main.c b/trunk/drivers/net/qlge/qlge_main.c
index 0775b4d7d3ff..738691ddcc04 100644
--- a/trunk/drivers/net/qlge/qlge_main.c
+++ b/trunk/drivers/net/qlge/qlge_main.c
@@ -1532,6 +1532,15 @@ static void ql_process_mac_rx_intr(struct ql_adapter *qdev,
 		dev_kfree_skb_any(skb);
 		return;
 	}
+
+	/* The max framesize filter on this chip is set higher than
+	 * MTU since FCoE uses 2k frames.
+	 */
+	if (skb->len > ndev->mtu + ETH_HLEN) {
+		dev_kfree_skb_any(skb);
+		return;
+	}
+
 	prefetch(skb->data);
 	skb->dev = ndev;
 	if (ib_mac_rsp->flags1 & IB_MAC_IOCB_RSP_M_MASK) {