Commit 9ad9a26e authored by Bob Copeland's avatar Bob Copeland Committed by John W. Linville

ath5k: enable hardware encryption for WEP

This change re-enables hardware encryption for ath5k after setting up
mac80211 to handle the initialization vectors which happens to make it
work.  Add a module param (nohwcrypt) to optionally turn it off.
Signed-off-by: default avatarBob Copeland <me@bobcopeland.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 2a941ecb
...@@ -60,6 +60,9 @@ ...@@ -60,6 +60,9 @@
#include "debug.h" #include "debug.h"
static int ath5k_calinterval = 10; /* Calibrate PHY every 10 secs (TODO: Fixme) */ static int ath5k_calinterval = 10; /* Calibrate PHY every 10 secs (TODO: Fixme) */
static int modparam_nohwcrypt;
module_param_named(nohwcrypt, modparam_nohwcrypt, int, 0444);
MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption.");
/******************\ /******************\
...@@ -2975,11 +2978,12 @@ ath5k_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, ...@@ -2975,11 +2978,12 @@ ath5k_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
struct ath5k_softc *sc = hw->priv; struct ath5k_softc *sc = hw->priv;
int ret = 0; int ret = 0;
if (modparam_nohwcrypt)
return -EOPNOTSUPP;
switch (key->alg) { switch (key->alg) {
case ALG_WEP: case ALG_WEP:
/* XXX: fix hardware encryption, its not working. For now break;
* allow software encryption */
/* break; */
case ALG_TKIP: case ALG_TKIP:
case ALG_CCMP: case ALG_CCMP:
return -EOPNOTSUPP; return -EOPNOTSUPP;
...@@ -2999,6 +3003,7 @@ ath5k_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, ...@@ -2999,6 +3003,7 @@ ath5k_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
} }
__set_bit(key->keyidx, sc->keymap); __set_bit(key->keyidx, sc->keymap);
key->hw_key_idx = key->keyidx; key->hw_key_idx = key->keyidx;
key->flags |= IEEE80211_KEY_FLAG_GENERATE_IV;
break; break;
case DISABLE_KEY: case DISABLE_KEY:
ath5k_hw_reset_key(sc->ah, key->keyidx); ath5k_hw_reset_key(sc->ah, key->keyidx);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment