diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-01-19 15:58:41 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-01-19 15:58:41 -0500 |
| commit | 031cf0e94c9c8302a4592707939d6c2039f17f28 (patch) | |
| tree | 02f3f0d3f89f03217bdb83530af30a95c9ab6191 /drivers/net/wireless/p54 | |
| parent | 730dd70549e0ec755dd55615ba5cfc38a482a947 (diff) | |
| parent | ad580db50ee8dccd069ffcd76d6f70fa6d4a62a8 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/p54')
| -rw-r--r-- | drivers/net/wireless/p54/p54pci.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/wireless/p54/p54pci.c b/drivers/net/wireless/p54/p54pci.c index a15962a19b2a..a72f7c2577de 100644 --- 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, | |||
| 197 | i %= ring_limit; | 197 | i %= ring_limit; |
| 198 | continue; | 198 | continue; |
| 199 | } | 199 | } |
| 200 | |||
| 201 | if (unlikely(len > priv->common.rx_mtu)) { | ||
| 202 | if (net_ratelimit()) | ||
| 203 | dev_err(&priv->pdev->dev, "rx'd frame size " | ||
| 204 | "exceeds length threshold.\n"); | ||
| 205 | |||
| 206 | len = priv->common.rx_mtu; | ||
| 207 | } | ||
| 200 | skb_put(skb, len); | 208 | skb_put(skb, len); |
| 201 | 209 | ||
| 202 | if (p54_rx(dev, skb)) { | 210 | if (p54_rx(dev, skb)) { |