diff options
| author | sam <sam@FreeBSD.org> | 2006-02-10 19:01:02 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2006-02-10 19:01:02 +0000 |
| commit | eae844806985ca8ccfff98727e2799b3f31ef77a (patch) | |
| tree | b83e5a51db93c919482e068bcdcf4029c2d2e294 /sys/contrib | |
| parent | 066a4db4b427ac9b7f3263e00456398b34ba81cb (diff) | |
| download | FreeBSD-src-eae844806985ca8ccfff98727e2799b3f31ef77a.zip FreeBSD-src-eae844806985ca8ccfff98727e2799b3f31ef77a.tar.gz | |
resolve merge conflicts
MFC after: 2 weeks
Diffstat (limited to 'sys/contrib')
| -rw-r--r-- | sys/contrib/dev/ath/freebsd/ah_osdep.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/contrib/dev/ath/freebsd/ah_osdep.c b/sys/contrib/dev/ath/freebsd/ah_osdep.c index 1dc7460..f421d13 100644 --- a/sys/contrib/dev/ath/freebsd/ah_osdep.c +++ b/sys/contrib/dev/ath/freebsd/ah_osdep.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2004 Sam Leffler, Errno Consulting, Atheros + * Copyright (c) 2002-2006 Sam Leffler, Errno Consulting, Atheros * Communications, Inc. All rights reserved. * * Redistribution and use in source and binary forms are permitted @@ -33,7 +33,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGES. * - * $Id: ah_osdep.c,v 1.35 2004/10/25 01:02:50 sam Exp $ + * $Id: //depot/sw/linuxsrc/src/802_11/madwifi/hal/main/freebsd/ah_osdep.c#39 $ */ #include "opt_ah.h" @@ -95,16 +95,18 @@ SYSCTL_INT(_hw_ath_hal, OID_AUTO, swba_backoff, CTLFLAG_RW, &ath_hal_additional_swba_backoff, 0, "Atheros HAL additional SWBA backoff time"); +MALLOC_DEFINE(M_ATH_HAL, "ath_hal", "ath hal data"); + void* ath_hal_malloc(size_t size) { - return malloc(size, M_DEVBUF, M_NOWAIT | M_ZERO); + return malloc(size, M_ATH_HAL, M_NOWAIT | M_ZERO); } void ath_hal_free(void* p) { - return free(p, M_DEVBUF); + return free(p, M_ATH_HAL); } void |
