diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-05-11 14:24:55 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-05-11 14:24:55 -0400 |
| commit | cc755896a4274f11283bca32d1d658203844057a (patch) | |
| tree | 218970ece71df99f686b9416b7fd88b921690ebb /drivers/net/wireless/rt2x00/rt2800usb.h | |
| parent | d250fe91ae129bff0968e685cc9c466d3a5e3482 (diff) | |
| parent | 9459d59fbf0bc82ff4c804679fa8bc22788eca63 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/ath/ar9170/main.c
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2800usb.h')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2800usb.h | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.h b/drivers/net/wireless/rt2x00/rt2800usb.h index d1d8ae94b4d..2bca6a71a7f 100644 --- a/drivers/net/wireless/rt2x00/rt2800usb.h +++ b/drivers/net/wireless/rt2x00/rt2800usb.h | |||
| @@ -79,8 +79,6 @@ | |||
| 79 | */ | 79 | */ |
| 80 | #define TXINFO_DESC_SIZE ( 1 * sizeof(__le32) ) | 80 | #define TXINFO_DESC_SIZE ( 1 * sizeof(__le32) ) |
| 81 | #define RXINFO_DESC_SIZE ( 1 * sizeof(__le32) ) | 81 | #define RXINFO_DESC_SIZE ( 1 * sizeof(__le32) ) |
| 82 | #define RXWI_DESC_SIZE ( 4 * sizeof(__le32) ) | ||
| 83 | #define RXD_DESC_SIZE ( 1 * sizeof(__le32) ) | ||
| 84 | 82 | ||
| 85 | /* | 83 | /* |
| 86 | * TX Info structure | 84 | * TX Info structure |
| @@ -113,44 +111,6 @@ | |||
| 113 | #define RXINFO_W0_USB_DMA_RX_PKT_LEN FIELD32(0x0000ffff) | 111 | #define RXINFO_W0_USB_DMA_RX_PKT_LEN FIELD32(0x0000ffff) |
| 114 | 112 | ||
| 115 | /* | 113 | /* |
| 116 | * RX WI structure | ||
| 117 | */ | ||
| 118 | |||
| 119 | /* | ||
| 120 | * Word0 | ||
| 121 | */ | ||
| 122 | #define RXWI_W0_WIRELESS_CLI_ID FIELD32(0x000000ff) | ||
| 123 | #define RXWI_W0_KEY_INDEX FIELD32(0x00000300) | ||
| 124 | #define RXWI_W0_BSSID FIELD32(0x00001c00) | ||
| 125 | #define RXWI_W0_UDF FIELD32(0x0000e000) | ||
| 126 | #define RXWI_W0_MPDU_TOTAL_BYTE_COUNT FIELD32(0x0fff0000) | ||
| 127 | #define RXWI_W0_TID FIELD32(0xf0000000) | ||
| 128 | |||
| 129 | /* | ||
| 130 | * Word1 | ||
| 131 | */ | ||
| 132 | #define RXWI_W1_FRAG FIELD32(0x0000000f) | ||
| 133 | #define RXWI_W1_SEQUENCE FIELD32(0x0000fff0) | ||
| 134 | #define RXWI_W1_MCS FIELD32(0x007f0000) | ||
| 135 | #define RXWI_W1_BW FIELD32(0x00800000) | ||
| 136 | #define RXWI_W1_SHORT_GI FIELD32(0x01000000) | ||
| 137 | #define RXWI_W1_STBC FIELD32(0x06000000) | ||
| 138 | #define RXWI_W1_PHYMODE FIELD32(0xc0000000) | ||
| 139 | |||
| 140 | /* | ||
| 141 | * Word2 | ||
| 142 | */ | ||
| 143 | #define RXWI_W2_RSSI0 FIELD32(0x000000ff) | ||
| 144 | #define RXWI_W2_RSSI1 FIELD32(0x0000ff00) | ||
| 145 | #define RXWI_W2_RSSI2 FIELD32(0x00ff0000) | ||
| 146 | |||
| 147 | /* | ||
| 148 | * Word3 | ||
| 149 | */ | ||
| 150 | #define RXWI_W3_SNR0 FIELD32(0x000000ff) | ||
| 151 | #define RXWI_W3_SNR1 FIELD32(0x0000ff00) | ||
| 152 | |||
| 153 | /* | ||
| 154 | * RX descriptor format for RX Ring. | 114 | * RX descriptor format for RX Ring. |
| 155 | */ | 115 | */ |
| 156 | 116 | ||