Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

2010-01-19 15:58:41 -05:00
parent 730dd70549 ad580db50e
commit 031cf0e94c
17 changed files with 119 additions and 29 deletions
--- a/drivers/net/wireless/p54/p54pci.c
+++ b/drivers/net/wireless/p54/p54pci.c
@@ -197,6 +197,14 @@ static void p54p_check_rx_ring(struct ieee80211_hw *dev, u32 *index,
 			i %= ring_limit;
 			continue;
 		}
+
+		if (unlikely(len > priv->common.rx_mtu)) {
+			if (net_ratelimit())
+				dev_err(&priv->pdev->dev, "rx'd frame size "
+					"exceeds length threshold.\n");
+
+			len = priv->common.rx_mtu;
+		}
 		skb_put(skb, len);

 		if (p54_rx(dev, skb)) {