From 27d9171c0aadbac51ead3eedd49831f81d9f5536 Mon Sep 17 00:00:00 2001
From: Charles Longeau <chl@cvs.openbsd.org>
Date: Mon, 29 Oct 2007 15:40:24 +0000
Subject: MALLOC/FREE -> malloc/free

ok krw@
---
 sys/net80211/ieee80211_input.c | 6 +++---
 sys/net80211/ieee80211_node.c  | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'sys')

diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c
index 095aa0445b6..f9b8d6dcc22 100644
--- a/sys/net80211/ieee80211_input.c
+++ b/sys/net80211/ieee80211_input.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: ieee80211_input.c,v 1.24 2004/05/31 11:12:24 dyoung Exp $	*/
-/*	$OpenBSD: ieee80211_input.c,v 1.71 2007/09/18 22:02:18 djm Exp $	*/
+/*	$OpenBSD: ieee80211_input.c,v 1.72 2007/10/29 15:40:23 chl Exp $	*/
 /*-
  * Copyright (c) 2001 Atsushi Onoe
  * Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting
@@ -1093,8 +1093,8 @@ ieee80211_save_ie(const u_int8_t *frm, u_int8_t **ie)
 {
 	if (*ie == NULL || (*ie)[1] != frm[1]) {
 		if (*ie != NULL)
-			FREE(*ie, M_DEVBUF);
-		MALLOC(*ie, u_int8_t *, 2 + frm[1], M_DEVBUF, M_NOWAIT);
+			free(*ie, M_DEVBUF);
+		*ie = malloc(2 + frm[1], M_DEVBUF, M_NOWAIT);
 		if (*ie == NULL)
 			return ENOMEM;
 	}
diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c
index f13bd95c007..1384c998a10 100644
--- a/sys/net80211/ieee80211_node.c
+++ b/sys/net80211/ieee80211_node.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ieee80211_node.c,v 1.29 2007/09/07 20:23:30 damien Exp $	*/
+/*	$OpenBSD: ieee80211_node.c,v 1.30 2007/10/29 15:40:23 chl Exp $	*/
 /*	$NetBSD: ieee80211_node.c,v 1.14 2004/05/09 09:18:47 dyoung Exp $	*/
 
 /*-
@@ -162,9 +162,9 @@ ieee80211_node_detach(struct ifnet *ifp)
 	}
 	ieee80211_free_allnodes(ic);
 	if (ic->ic_aid_bitmap != NULL)
-		FREE(ic->ic_aid_bitmap, M_DEVBUF);
+		free(ic->ic_aid_bitmap, M_DEVBUF);
 	if (ic->ic_tim_bitmap != NULL)
-		FREE(ic->ic_tim_bitmap, M_DEVBUF);
+		free(ic->ic_tim_bitmap, M_DEVBUF);
 }
 
 /*
@@ -535,7 +535,7 @@ void
 ieee80211_node_free(struct ieee80211com *ic, struct ieee80211_node *ni)
 {
 	ieee80211_node_cleanup(ic, ni);
-	FREE(ni, M_80211_NODE);
+	free(ni, M_80211_NODE);
 }
 
 void
-- 
cgit v1.2.3