diff options
| author | David S. Miller <davem@davemloft.net> | 2010-03-15 19:23:54 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-15 19:23:54 -0400 |
| commit | 4961e02f1999e1c3468c09b2669c94d7c3ae82a8 (patch) | |
| tree | 44c15abb09d7ba5e17a9aba95ee246648b1c1a8a /drivers/net/wireless/rt2x00/rt2x00dev.c | |
| parent | d14a0ebda7d3daede1a99c01527affb9ceaa4c22 (diff) | |
| parent | a3d3203e4bb40f253b1541e310dc0f9305be7c84 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00dev.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c index b93731b79903..dd5ab8fe2321 100644 --- a/drivers/net/wireless/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c | |||
| @@ -394,7 +394,7 @@ void rt2x00lib_rxdone(struct rt2x00_dev *rt2x00dev, | |||
| 394 | /* | 394 | /* |
| 395 | * Hardware might have stripped the IV/EIV/ICV data, | 395 | * Hardware might have stripped the IV/EIV/ICV data, |
| 396 | * in that case it is possible that the data was | 396 | * in that case it is possible that the data was |
| 397 | * provided seperately (through hardware descriptor) | 397 | * provided separately (through hardware descriptor) |
| 398 | * in which case we should reinsert the data into the frame. | 398 | * in which case we should reinsert the data into the frame. |
| 399 | */ | 399 | */ |
| 400 | if ((rxdesc.dev_flags & RXDONE_CRYPTO_IV) && | 400 | if ((rxdesc.dev_flags & RXDONE_CRYPTO_IV) && |