diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-02-22 14:44:50 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-02-22 14:44:50 -0500 |
| commit | 8715d941b2fa8591474e7d0dad66589fce1892d2 (patch) | |
| tree | ec228ec158bb5b4424f898d336279c29de4cf81f /drivers/net/wireless/wl12xx/tx.h | |
| parent | ca994a36f585432458ead9133fcfe05440edbb7b (diff) | |
| parent | 51c4ed95a857ded6017537fd53fa00db64908954 (diff) | |
Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx
Diffstat (limited to 'drivers/net/wireless/wl12xx/tx.h')
| -rw-r--r-- | drivers/net/wireless/wl12xx/tx.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/tx.h b/drivers/net/wireless/wl12xx/tx.h index 2dbb24e6d541..e3977b55a710 100644 --- a/drivers/net/wireless/wl12xx/tx.h +++ b/drivers/net/wireless/wl12xx/tx.h | |||
| @@ -39,6 +39,7 @@ | |||
| 39 | #define TX_HW_ATTR_LAST_WORD_PAD (BIT(10) | BIT(11)) | 39 | #define TX_HW_ATTR_LAST_WORD_PAD (BIT(10) | BIT(11)) |
| 40 | #define TX_HW_ATTR_TX_CMPLT_REQ BIT(12) | 40 | #define TX_HW_ATTR_TX_CMPLT_REQ BIT(12) |
| 41 | #define TX_HW_ATTR_TX_DUMMY_REQ BIT(13) | 41 | #define TX_HW_ATTR_TX_DUMMY_REQ BIT(13) |
| 42 | #define TX_HW_ATTR_HOST_ENCRYPT BIT(14) | ||
| 42 | 43 | ||
| 43 | #define TX_HW_ATTR_OFST_SAVE_RETRIES 0 | 44 | #define TX_HW_ATTR_OFST_SAVE_RETRIES 0 |
| 44 | #define TX_HW_ATTR_OFST_HEADER_PAD 1 | 45 | #define TX_HW_ATTR_OFST_HEADER_PAD 1 |
| @@ -51,7 +52,9 @@ | |||
| 51 | #define TX_HW_RESULT_QUEUE_LEN_MASK 0xf | 52 | #define TX_HW_RESULT_QUEUE_LEN_MASK 0xf |
| 52 | 53 | ||
| 53 | #define WL1271_TX_ALIGN_TO 4 | 54 | #define WL1271_TX_ALIGN_TO 4 |
| 54 | #define WL1271_TKIP_IV_SPACE 4 | 55 | #define WL1271_EXTRA_SPACE_TKIP 4 |
| 56 | #define WL1271_EXTRA_SPACE_AES 8 | ||
| 57 | #define WL1271_EXTRA_SPACE_MAX 8 | ||
| 55 | 58 | ||
| 56 | /* Used for management frames and dummy packets */ | 59 | /* Used for management frames and dummy packets */ |
| 57 | #define WL1271_TID_MGMT 7 | 60 | #define WL1271_TID_MGMT 7 |