Make m_flags an int instead of a short, this is consistent with the

type of the 'flags' argument m_getcl() was using anyway; m_extadd()
needed to be changed to accept an int instead of a short for 'flags.'
This makes things more consistent and also gives us more bits to
use for m_flags in the future (we have almost run out).

Requested by: sam (Sam Leffler)

2 files changed, 3 insertions, 3 deletions

diff --git a/sys/kern/subr_mbuf.c b/sys/kern/subr_mbuf.c
index c059c49..d066fe3 100644
--- a/sys/kern/subr_mbuf.c
+++ b/sys/kern/subr_mbuf.c
@@ -1511,7 +1511,7 @@ m_clget(struct mbuf *mb, int how)
  */
 void
 m_extadd(struct mbuf *mb, caddr_t buf, u_int size,
-    void (*freef)(void *, void *), void *args, short flags, int type)
+    void (*freef)(void *, void *), void *args, int flags, int type)
 {
 
 	_mext_init_ref(mb, ((type != EXT_CLUSTER) ?
diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h
index e4a3de8..2d61e73 100644
--- a/sys/sys/mbuf.h
+++ b/sys/sys/mbuf.h
@@ -71,8 +71,8 @@ struct m_hdr {
 	struct	mbuf *mh_nextpkt;	/* next chain in queue/record */
 	caddr_t	mh_data;		/* location of data */
 	int	mh_len;			/* amount of data in this mbuf */
+	int	mh_flags;		/* flags; see below */
 	short	mh_type;		/* type of data in this mbuf */
-	short	mh_flags;		/* flags; see below */
 };
 
 /*
@@ -471,7 +471,7 @@ void		 m_cat(struct mbuf *, struct mbuf *);
 void		 m_chtype(struct mbuf *, short);
 void		 m_clget(struct mbuf *, int);
 void		 m_extadd(struct mbuf *, caddr_t, u_int,
-		    void (*free)(void *, void *), void *, short, int);
+		    void (*free)(void *, void *), void *, int, int);
 void		 m_copyback(struct mbuf *, int, int, caddr_t);
 void		 m_copydata(const struct mbuf *, int, int, caddr_t);
 struct	mbuf	*m_copym(struct mbuf *, int, int, int);