[MAC80211]: remove HW_KEY_IDX_INVALID

This patch makes the mac80211/driver interface rely only on the
IEEE80211_TXCTL_DO_NOT_ENCRYPT flag to signal to the driver whether
a frame should be encrypted or not, since mac80211 internally no
longer relies on HW_KEY_IDX_INVALID either this removes it, changes
the key index to be a u8 in all places and makes the full range of
the value available to drivers.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Acked-by: Michael Wu <flamingice@sourmilk.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 0 insertions, 4 deletions

diff --git a/net/mac80211/key.c b/net/mac80211/key.c
index b10e33deb63e..dd6fc4aa3ff5 100644
--- a/net/mac80211/key.c
+++ b/net/mac80211/key.c
@@ -73,8 +73,6 @@ static void ieee80211_key_enable_hw_accel(struct ieee80211_key *key)
                                        key->sdata->dev->dev_addr, addr,
                                        &key->conf);
 
-        WARN_ON(!ret && (key->conf.hw_key_idx == HW_KEY_IDX_INVALID));
-
         if (!ret)
                 key->flags |= KEY_FLAG_UPLOADED_TO_HARDWARE;
 
@@ -109,7 +107,6 @@ static void ieee80211_key_disable_hw_accel(struct ieee80211_key *key)
                        key->conf.keyidx, MAC_ARG(addr), ret);
 
         key->flags &= ~KEY_FLAG_UPLOADED_TO_HARDWARE;
-        key->conf.hw_key_idx = HW_KEY_IDX_INVALID;
 }
 
 struct ieee80211_key *ieee80211_key_alloc(struct ieee80211_sub_if_data *sdata,
@@ -132,7 +129,6 @@ struct ieee80211_key *ieee80211_key_alloc(struct ieee80211_sub_if_data *sdata,
          * Default to software encryption; we'll later upload the
          * key to the hardware if possible.
          */
-        key->conf.hw_key_idx = HW_KEY_IDX_INVALID;
         key->conf.flags = 0;
         key->flags = 0;