Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 202780
b: refs/heads/master
c: b7b1b51
h: refs/heads/master
v: v3
  • Loading branch information
Vasanthakumar Thiagarajan authored and John W. Linville committed Jun 2, 2010
1 parent 2e97d90 commit e7a211d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5c6dd921776946d12cbbae8ab92c5d6773b25810
refs/heads/master: b7b1b512287d6917d4976a4ee0e7d72c4edf52eb
3 changes: 2 additions & 1 deletion trunk/drivers/net/wireless/ath/ath9k/recv.c
Original file line number Diff line number Diff line change
Expand Up @@ -830,6 +830,7 @@ static bool ath9k_rx_accept(struct ath_common *common,
{
struct ath_hw *ah = common->ah;
__le16 fc;
u8 rx_status_len = ah->caps.rx_status_len;

fc = hdr->frame_control;

Expand All @@ -840,7 +841,7 @@ static bool ath9k_rx_accept(struct ath_common *common,
* we can take a hint that hardware corrupted it, so ignore
* those frames.
*/
if (rx_stats->rs_datalen > common->rx_bufsize)
if (rx_stats->rs_datalen > (common->rx_bufsize - rx_status_len))
return false;

/*
Expand Down

0 comments on commit e7a211d

Please sign in to comment.