1 files changed, 2 insertions, 2 deletions

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index d70140cbd66a..b65ff6536244 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -536,7 +536,7 @@ ieee80211_tx_h_fragment(struct ieee80211_txrx_data *tx)
 
 static int wep_encrypt_skb(struct ieee80211_txrx_data *tx, struct sk_buff *skb)
 {
-        if (tx->key->conf.flags & IEEE80211_KEY_FORCE_SW_ENCRYPT) {
+        if (!(tx->key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE)) {
                 if (ieee80211_wep_encrypt(tx->local, skb, tx->key))
                         return -1;
         } else {
@@ -832,7 +832,7 @@ __ieee80211_parse_tx_radiotap(
          */
 
         control->retry_limit = 1; /* no retry */
-        control->key_idx = -1; /* no encryption key */
+        control->key_idx = HW_KEY_IDX_INVALID;
         control->flags &= ~(IEEE80211_TXCTL_USE_RTS_CTS |
                             IEEE80211_TXCTL_USE_CTS_PROTECT);
         control->flags |= IEEE80211_TXCTL_DO_NOT_ENCRYPT |