diff options
| author | des <des@FreeBSD.org> | 2008-10-23 19:57:13 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2008-10-23 19:57:13 +0000 |
| commit | 2668f9825b6a67e6cde6f82c2a5ec2b8ff9c4e56 (patch) | |
| tree | 2609af8ef76f3a981fc12a1baa30a22ecf79aabf /sys/net80211/ieee80211_crypto_tkip.c | |
| parent | 859f75637c27578fee3a238da82d0eac47dc22f5 (diff) | |
| download | FreeBSD-src-2668f9825b6a67e6cde6f82c2a5ec2b8ff9c4e56.zip FreeBSD-src-2668f9825b6a67e6cde6f82c2a5ec2b8ff9c4e56.tar.gz | |
Revert the removal of the MALLOC and FREE macros from the net80211 code.
Requested by: sam
Diffstat (limited to 'sys/net80211/ieee80211_crypto_tkip.c')
| -rw-r--r-- | sys/net80211/ieee80211_crypto_tkip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/net80211/ieee80211_crypto_tkip.c b/sys/net80211/ieee80211_crypto_tkip.c index 744b643..f509856 100644 --- a/sys/net80211/ieee80211_crypto_tkip.c +++ b/sys/net80211/ieee80211_crypto_tkip.c @@ -109,7 +109,7 @@ tkip_attach(struct ieee80211vap *vap, struct ieee80211_key *k) { struct tkip_ctx *ctx; - ctx = malloc(sizeof(struct tkip_ctx), + MALLOC(ctx, struct tkip_ctx *, sizeof(struct tkip_ctx), M_80211_CRYPTO, M_NOWAIT | M_ZERO); if (ctx == NULL) { vap->iv_stats.is_crypto_nomem++; @@ -126,7 +126,7 @@ tkip_detach(struct ieee80211_key *k) { struct tkip_ctx *ctx = k->wk_private; - free(ctx, M_80211_CRYPTO); + FREE(ctx, M_80211_CRYPTO); KASSERT(nrefs > 0, ("imbalanced attach/detach")); nrefs--; /* NB: we assume caller locking */ } |
