diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-30 06:51:00 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-30 06:51:00 +0200 |
| commit | e93dc4891df93d7efa59d861fdcbb529a1819343 (patch) | |
| tree | 545d95bc78c76d44b22bf2590c033311f44c0616 /drivers/net/wireless/iwlwifi/iwl-tx.c | |
| parent | Linux 2.6.27-rc1 (diff) | |
| parent | mac80211: fix mesh beaconing (diff) | |
| download | linux-e93dc4891df93d7efa59d861fdcbb529a1819343.tar.xz linux-e93dc4891df93d7efa59d861fdcbb529a1819343.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-tx.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-tx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c index 9b50b1052b09..f72cd0bf6aa3 100644 --- a/drivers/net/wireless/iwlwifi/iwl-tx.c +++ b/drivers/net/wireless/iwlwifi/iwl-tx.c @@ -906,7 +906,7 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) * first entry */ iwl_hw_txq_attach_buf_to_tfd(priv, tfd, txcmd_phys, len); - if (!(info->flags & IEEE80211_TX_CTL_DO_NOT_ENCRYPT)) + if (info->control.hw_key) iwl_tx_cmd_build_hwcrypto(priv, info, tx_cmd, skb, sta_id); /* Set up TFD's 2nd entry to point directly to remainder of skb, |