diff options
| author | sam <sam@FreeBSD.org> | 2008-12-18 23:00:09 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2008-12-18 23:00:09 +0000 |
| commit | 7aaeeb07043adcd94c535d5c394f69f9c560c4ad (patch) | |
| tree | b42405564087361d41f618b7f4c6bab0f5f3fd52 /sys/net80211/ieee80211_scan_sta.c | |
| parent | b3c73dcac3e506d7568bd9ad1458369b01018e33 (diff) | |
| download | FreeBSD-src-7aaeeb07043adcd94c535d5c394f69f9c560c4ad.zip FreeBSD-src-7aaeeb07043adcd94c535d5c394f69f9c560c4ad.tar.gz | |
convert MALLOC/FREE to malloc/free
Diffstat (limited to 'sys/net80211/ieee80211_scan_sta.c')
| -rw-r--r-- | sys/net80211/ieee80211_scan_sta.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/net80211/ieee80211_scan_sta.c b/sys/net80211/ieee80211_scan_sta.c index f722d6b..15e4ff6 100644 --- a/sys/net80211/ieee80211_scan_sta.c +++ b/sys/net80211/ieee80211_scan_sta.c @@ -140,7 +140,7 @@ sta_attach(struct ieee80211_scan_state *ss) { struct sta_table *st; - MALLOC(st, struct sta_table *, sizeof(struct sta_table), + st = (struct sta_table *) malloc(sizeof(struct sta_table), M_80211_SCAN, M_NOWAIT | M_ZERO); if (st == NULL) return 0; @@ -164,7 +164,7 @@ sta_detach(struct ieee80211_scan_state *ss) sta_flush_table(st); mtx_destroy(&st->st_lock); mtx_destroy(&st->st_scanlock); - FREE(st, M_80211_SCAN); + free(st, M_80211_SCAN); KASSERT(nrefs > 0, ("imbalanced attach/detach")); nrefs--; /* NB: we assume caller locking */ } @@ -198,7 +198,7 @@ sta_flush_table(struct sta_table *st) TAILQ_REMOVE(&st->st_entry, se, se_list); LIST_REMOVE(se, se_hash); ieee80211_ies_cleanup(&se->base.se_ies); - FREE(se, M_80211_SCAN); + free(se, M_80211_SCAN); } memset(st->st_maxrssi, 0, sizeof(st->st_maxrssi)); } @@ -231,7 +231,7 @@ sta_add(struct ieee80211_scan_state *ss, LIST_FOREACH(se, &st->st_hash[hash], se_hash) if (IEEE80211_ADDR_EQ(se->base.se_macaddr, macaddr)) goto found; - MALLOC(se, struct sta_entry *, sizeof(struct sta_entry), + se = (struct sta_entry *) malloc(sizeof(struct sta_entry), M_80211_SCAN, M_NOWAIT | M_ZERO); if (se == NULL) { mtx_unlock(&st->st_lock); @@ -1509,7 +1509,7 @@ adhoc_age(struct ieee80211_scan_state *ss) TAILQ_REMOVE(&st->st_entry, se, se_list); LIST_REMOVE(se, se_hash); ieee80211_ies_cleanup(&se->base.se_ies); - FREE(se, M_80211_SCAN); + free(se, M_80211_SCAN); } } mtx_unlock(&st->st_lock); |
