Thu Dec 27 14:41:10 2012 UTC ()

- hit me with your parenthesis stick
- remove extra void *


(christos)

diff -r1.149 -r1.150 src/sys/sys/mbuf.h

--- src/sys/sys/mbuf.h 2012/04/29 16:36:54	1.149
+++ src/sys/sys/mbuf.h 2012/12/27 14:41:10	1.150

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mbuf.h,v 1.149 2012/04/29 16:36:54 dsl Exp $	*/
+/*	$NetBSD: mbuf.h,v 1.150 2012/12/27 14:41:10 christos Exp $	*/
 /*-
  * Copyright (c) 1996, 1997, 1999, 2001, 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center and Matt Thomas of 3am Software Foundry.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -498,27 +498,27 @@ do {									\
 		/* ext_paddr initialized above */			\
 		mowner_ref((m), M_EXT|M_CLUSTER);			\
 	}								\
 } while (/* CONSTCOND */ 0)
 /*
  * The standard mbuf cluster pool.
  */
 #define	MCLGET(m, how)	_MCLGET((m), mcl_cache, MCLBYTES, (how))
 #define	MEXTMALLOC(m, size, how)					\
 do {									\
 	(m)->m_ext_storage.ext_buf =					\
-	    (void *)malloc((size), mbtypes[(m)->m_type], (how));	\
+	    malloc((size), mbtypes[(m)->m_type], (how));		\
 	if ((m)->m_ext_storage.ext_buf != NULL) {			\
 		MCLINITREFERENCE(m);					\
 		(m)->m_data = (m)->m_ext.ext_buf;			\
 		(m)->m_flags = ((m)->m_flags & ~M_EXTCOPYFLAGS) |	\
 				M_EXT|M_EXT_RW;				\
 		(m)->m_ext.ext_flags = 0;				\
 		(m)->m_ext.ext_size = (size);				\
 		(m)->m_ext.ext_free = NULL;				\
 		(m)->m_ext.ext_arg = NULL;				\
 		mowner_ref((m), M_EXT);					\
 	}								\
 } while (/* CONSTCOND */ 0)
 @@ -549,30 +549,30 @@ do {									\
 /*
  * MFREE(struct mbuf *m, struct mbuf *n)
  * Free a single mbuf and associated external storage.
  * Place the successor, if any, in n.
  */
 #define	MFREE(m, n)							\
 	mowner_revoke((m), 1, (m)->m_flags);				\
 	mbstat_type_add((m)->m_type, -1);				\
 	if ((m)->m_flags & M_PKTHDR)					\
 		m_tag_delete_chain((m), NULL);				\
 	(n) = (m)->m_next;						\
 	if ((m)->m_flags & M_EXT) {					\
-		m_ext_free(m);						\
+		m_ext_free((m));						\
 	} else {							\
-		KASSERT(m->m_type != MT_FREE);				\
+		KASSERT((m)->m_type != MT_FREE);				\
-		m->m_type = MT_FREE;					\
+		(m)->m_type = MT_FREE;					\
 		pool_cache_put(mb_cache, (m));				\
 	}								\
 /*
  * Copy mbuf pkthdr from `from' to `to'.
  * `from' must have M_PKTHDR set, and `to' must be empty.
  */
 #define	M_COPY_PKTHDR(to, from)						\
 do {									\
 	(to)->m_pkthdr = (from)->m_pkthdr;				\
 	(to)->m_flags = (from)->m_flags & M_COPYFLAGS;			\
 	SLIST_INIT(&(to)->m_pkthdr.tags);				\
 	m_tag_copy_chain((to), (from));					\