diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-05-29 15:56:46 -0400 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-05-29 15:56:46 -0400 |
| commit | 774439518ac01049e9bf44f2fa4c604981f39dbf (patch) | |
| tree | b324e2e129ee4d9dcb1c1466590ce71d087e8158 /drivers/net/wireless/iwlwifi/pcie | |
| parent | b571a69745dc90aec3d0505a7ceac2702a93861b (diff) | |
| parent | a910e4a94f6923c8c988565525f017f687bf7205 (diff) | |
Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/pcie')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/pcie/tx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/pcie/tx.c b/drivers/net/wireless/iwlwifi/pcie/tx.c index bf5f8246385e..a35c6aefbc3e 100644 --- a/drivers/net/wireless/iwlwifi/pcie/tx.c +++ b/drivers/net/wireless/iwlwifi/pcie/tx.c | |||
| @@ -224,13 +224,13 @@ static void iwl_pcie_txq_update_byte_cnt_tbl(struct iwl_trans *trans, | |||
| 224 | 224 | ||
| 225 | switch (sec_ctl & TX_CMD_SEC_MSK) { | 225 | switch (sec_ctl & TX_CMD_SEC_MSK) { |
| 226 | case TX_CMD_SEC_CCM: | 226 | case TX_CMD_SEC_CCM: |
| 227 | len += CCMP_MIC_LEN; | 227 | len += IEEE80211_CCMP_MIC_LEN; |
| 228 | break; | 228 | break; |
| 229 | case TX_CMD_SEC_TKIP: | 229 | case TX_CMD_SEC_TKIP: |
| 230 | len += TKIP_ICV_LEN; | 230 | len += IEEE80211_TKIP_ICV_LEN; |
| 231 | break; | 231 | break; |
| 232 | case TX_CMD_SEC_WEP: | 232 | case TX_CMD_SEC_WEP: |
| 233 | len += WEP_IV_LEN + WEP_ICV_LEN; | 233 | len += IEEE80211_WEP_IV_LEN + IEEE80211_WEP_ICV_LEN; |
| 234 | break; | 234 | break; |
| 235 | } | 235 | } |
| 236 | 236 | ||