diff options
| author | bapt <bapt@FreeBSD.org> | 2015-08-09 00:15:17 +0000 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2015-08-09 00:15:17 +0000 |
| commit | 2c81d1658920f732f451e9edffa48cf9b90607b1 (patch) | |
| tree | 20549ce39ea8b5a45adaa22dbf88f3cba90d926d /sys/dev/ath/if_ath_keycache.c | |
| parent | ee75e8628c34502fa04b16cab8adb0a4ab24a2fc (diff) | |
| parent | 9e0d1c3e199cfcd8480d2e892da387ebb1bbde8b (diff) | |
| download | FreeBSD-src-2c81d1658920f732f451e9edffa48cf9b90607b1.zip FreeBSD-src-2c81d1658920f732f451e9edffa48cf9b90607b1.tar.gz | |
Merge from HEAD
Diffstat (limited to 'sys/dev/ath/if_ath_keycache.c')
| -rw-r--r-- | sys/dev/ath/if_ath_keycache.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/ath/if_ath_keycache.c b/sys/dev/ath/if_ath_keycache.c index b8a77e8..fe99f10 100644 --- a/sys/dev/ath/if_ath_keycache.c +++ b/sys/dev/ath/if_ath_keycache.c @@ -425,7 +425,7 @@ int ath_key_alloc(struct ieee80211vap *vap, struct ieee80211_key *k, ieee80211_keyix *keyix, ieee80211_keyix *rxkeyix) { - struct ath_softc *sc = vap->iv_ic->ic_softc; + struct ath_softc *sc = vap->iv_ic->ic_ifp->if_softc; /* * Group key allocation must be handled specially for @@ -493,7 +493,7 @@ ath_key_alloc(struct ieee80211vap *vap, struct ieee80211_key *k, int ath_key_delete(struct ieee80211vap *vap, const struct ieee80211_key *k) { - struct ath_softc *sc = vap->iv_ic->ic_softc; + struct ath_softc *sc = vap->iv_ic->ic_ifp->if_softc; struct ath_hal *ah = sc->sc_ah; const struct ieee80211_cipher *cip = k->wk_cipher; u_int keyix = k->wk_keyix; @@ -538,7 +538,7 @@ int ath_key_set(struct ieee80211vap *vap, const struct ieee80211_key *k, const u_int8_t mac[IEEE80211_ADDR_LEN]) { - struct ath_softc *sc = vap->iv_ic->ic_softc; + struct ath_softc *sc = vap->iv_ic->ic_ifp->if_softc; return ath_keyset(sc, vap, k, vap->iv_bss); } |
