diff options
Diffstat (limited to 'sys/dev/ath/if_ath_keycache.c')
| -rw-r--r-- | sys/dev/ath/if_ath_keycache.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/sys/dev/ath/if_ath_keycache.c b/sys/dev/ath/if_ath_keycache.c index fe99f10..6c2749f 100644 --- a/sys/dev/ath/if_ath_keycache.c +++ b/sys/dev/ath/if_ath_keycache.c @@ -62,7 +62,6 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <net/if.h> -#include <net/if_var.h> #include <net/if_dl.h> #include <net/if_media.h> #include <net/if_types.h> @@ -78,7 +77,6 @@ __FBSDID("$FreeBSD$"); #include <dev/ath/if_ath_debug.h> #include <dev/ath/if_ath_keycache.h> -#include <dev/ath/if_ath_misc.h> #ifdef ATH_DEBUG static void @@ -199,7 +197,6 @@ ath_keyset(struct ath_softc *sc, struct ieee80211vap *vap, u_int8_t gmac[IEEE80211_ADDR_LEN]; const u_int8_t *mac; HAL_KEYVAL hk; - int ret; memset(&hk, 0, sizeof(hk)); /* @@ -253,19 +250,13 @@ ath_keyset(struct ath_softc *sc, struct ieee80211vap *vap, } else mac = k->wk_macaddr; - ATH_LOCK(sc); - ath_power_set_power_state(sc, HAL_PM_AWAKE); if (hk.kv_type == HAL_CIPHER_TKIP && (k->wk_flags & IEEE80211_KEY_SWMIC) == 0) { - ret = ath_keyset_tkip(sc, k, &hk, mac); + return ath_keyset_tkip(sc, k, &hk, mac); } else { KEYPRINTF(sc, k->wk_keyix, &hk, mac); - ret = ath_hal_keyset(ah, k->wk_keyix, &hk, mac); + return ath_hal_keyset(ah, k->wk_keyix, &hk, mac); } - ath_power_restore_power_state(sc); - ATH_UNLOCK(sc); - - return (ret); #undef N } @@ -500,8 +491,6 @@ ath_key_delete(struct ieee80211vap *vap, const struct ieee80211_key *k) DPRINTF(sc, ATH_DEBUG_KEYCACHE, "%s: delete key %u\n", __func__, keyix); - ATH_LOCK(sc); - ath_power_set_power_state(sc, HAL_PM_AWAKE); ath_hal_keyreset(ah, keyix); /* * Handle split tx/rx keying required for TKIP with h/w MIC. @@ -525,8 +514,6 @@ ath_key_delete(struct ieee80211vap *vap, const struct ieee80211_key *k) } } } - ath_power_restore_power_state(sc); - ATH_UNLOCK(sc); return 1; } |
