diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-12 19:16:02 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-12 19:16:02 -0400 |
| commit | a7e70158884629898d79709622a66b8ef99e4018 (patch) | |
| tree | bd0cd03816f85f5bcef84000e01b0f9701f063ed /drivers/net/wireless/rt2x00/rt2x00queue.h | |
| parent | 24743537d3f784a8b3014e934fad0a9c45e4e789 (diff) | |
| parent | 252f4bf400df1712408fe83ba199a66a1b57ab1d (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00queue.h')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00queue.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.h b/drivers/net/wireless/rt2x00/rt2x00queue.h index 217861f8d95f..5db6a99fce7d 100644 --- a/drivers/net/wireless/rt2x00/rt2x00queue.h +++ b/drivers/net/wireless/rt2x00/rt2x00queue.h | |||
| @@ -217,6 +217,7 @@ enum txdone_entry_desc_flags { | |||
| 217 | TXDONE_FALLBACK, | 217 | TXDONE_FALLBACK, |
| 218 | TXDONE_FAILURE, | 218 | TXDONE_FAILURE, |
| 219 | TXDONE_EXCESSIVE_RETRY, | 219 | TXDONE_EXCESSIVE_RETRY, |
| 220 | TXDONE_AMPDU, | ||
| 220 | }; | 221 | }; |
| 221 | 222 | ||
| 222 | /** | 223 | /** |