diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-05-29 14:51:50 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-05-29 14:51:50 -0400 |
| commit | 933faa43ab9c1545c53ea082a8e4e1d1859568aa (patch) | |
| tree | 933a7e52081af4cb32699587cb79173537f6c638 /drivers/net/wireless/iwlwifi/pcie/tx.c | |
| parent | 531efffc3e3ff52d732c8fa6f32e084e9c447612 (diff) | |
| parent | 6abb9cb99f33b20c2f32f18a3ae9cc7543e46edb (diff) | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/pcie/tx.c')
| -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, switch (sec_ctl & TX_CMD_SEC_MSK) { case TX_CMD_SEC_CCM: - len += CCMP_MIC_LEN; + len += IEEE80211_CCMP_MIC_LEN; break; case TX_CMD_SEC_TKIP: - len += TKIP_ICV_LEN; + len += IEEE80211_TKIP_ICV_LEN; break; case TX_CMD_SEC_WEP: - len += WEP_IV_LEN + WEP_ICV_LEN; + len += IEEE80211_WEP_IV_LEN + IEEE80211_WEP_ICV_LEN; break; } |