diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-05 12:56:57 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-05 12:56:57 -0400 |
| commit | 616ad8c44281c0c6711a72b560e01ec335ff27e0 (patch) | |
| tree | 0a20453ffedb09db6fb41a0c2208ccc2c7751d3a /drivers/net/wireless/rt2x00/rt2x00queue.h | |
| parent | 99809963c99e1ed868d9ebeb4a5e7ee1cbe0309f (diff) | |
| parent | b380b0d4f7dffcc235c0facefa537d4655619101 (diff) | |
Merge branch 'linus' into x86/defconfig
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00queue.h')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00queue.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.h b/drivers/net/wireless/rt2x00/rt2x00queue.h index a4a8c57004db..ff78e52ce43c 100644 --- a/drivers/net/wireless/rt2x00/rt2x00queue.h +++ b/drivers/net/wireless/rt2x00/rt2x00queue.h | |||
| @@ -173,10 +173,10 @@ struct rxdone_entry_desc { | |||
| 173 | * frame transmission failed due to excessive retries. | 173 | * frame transmission failed due to excessive retries. |
| 174 | */ | 174 | */ |
| 175 | enum txdone_entry_desc_flags { | 175 | enum txdone_entry_desc_flags { |
| 176 | TXDONE_UNKNOWN = 1 << 0, | 176 | TXDONE_UNKNOWN, |
| 177 | TXDONE_SUCCESS = 1 << 1, | 177 | TXDONE_SUCCESS, |
| 178 | TXDONE_FAILURE = 1 << 2, | 178 | TXDONE_FAILURE, |
| 179 | TXDONE_EXCESSIVE_RETRY = 1 << 3, | 179 | TXDONE_EXCESSIVE_RETRY, |
| 180 | }; | 180 | }; |
| 181 | 181 | ||
| 182 | /** | 182 | /** |