summaryrefslogtreecommitdiffstats
path: root/sys/dev/ral
diff options
context:
space:
mode:
authorsam <sam@FreeBSD.org>2005-07-10 00:17:05 +0000
committersam <sam@FreeBSD.org>2005-07-10 00:17:05 +0000
commit0cf4212697b43b0db220a1214814a995e8b35821 (patch)
tree338cf1d70e532734bbaeb8c6bc1dd2dae9dd11cf /sys/dev/ral
parentaa33c1cc86a8bd32c93cc88f706b51a697c63a7c (diff)
downloadFreeBSD-src-0cf4212697b43b0db220a1214814a995e8b35821.zip
FreeBSD-src-0cf4212697b43b0db220a1214814a995e8b35821.tar.gz
remove driver-private key allocators; use the default one instead
so wpa keys are handled properly Reviewed by: avatar Approved by: re (scottl)
Diffstat (limited to 'sys/dev/ral')
-rw-r--r--sys/dev/ral/if_ral.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/sys/dev/ral/if_ral.c b/sys/dev/ral/if_ral.c
index 9b56ee7..4a26c6c 100644
--- a/sys/dev/ral/if_ral.c
+++ b/sys/dev/ral/if_ral.c
@@ -91,8 +91,6 @@ static void ral_free_rx_ring(struct ral_softc *,
struct ral_rx_ring *);
static struct ieee80211_node *ral_node_alloc(
struct ieee80211_node_table *);
-static int ral_key_alloc(struct ieee80211com *,
- const struct ieee80211_key *);
static int ral_media_change(struct ifnet *);
static void ral_next_scan(void *);
static void ral_iter_func(void *, struct ieee80211_node *);
@@ -463,7 +461,6 @@ ral_attach(device_t dev)
/* override state transition machine */
sc->sc_newstate = ic->ic_newstate;
ic->ic_newstate = ral_newstate;
- ic->ic_crypto.cs_key_alloc = ral_key_alloc;
ieee80211_media_init(ic, ral_media_change, ieee80211_media_status);
bpfattach2(ifp, DLT_IEEE802_11_RADIO,
@@ -910,15 +907,6 @@ ral_node_alloc(struct ieee80211_node_table *nt)
}
static int
-ral_key_alloc(struct ieee80211com *ic, const struct ieee80211_key *k)
-{
- if (k >= ic->ic_nw_keys && k < &ic->ic_nw_keys[IEEE80211_WEP_NKID])
- return k - ic->ic_nw_keys;
-
- return IEEE80211_KEYIX_NONE;
-}
-
-static int
ral_media_change(struct ifnet *ifp)
{
struct ral_softc *sc = ifp->if_softc;
OpenPOWER on IntegriCloud