Introduce an M_ASSERTPKTHDR() macro which performs the very common task

of asserting that an mbuf has a packet header.  Use it instead of hand-
rolled versions wherever applicable.

Submitted by:	Hiten Pandya <hiten@unixdaemons.com>

4 files changed, 4 insertions, 6 deletions

diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c
index 162d7f7..d10ed97 100644
--- a/sys/netinet/ip_divert.c
+++ b/sys/netinet/ip_divert.c
@@ -180,7 +180,7 @@ divert_packet(struct mbuf *m, int incoming, int port, int rule)
 		struct ifaddr *ifa;
 
 		/* Sanity check */
-		KASSERT((m->m_flags & M_PKTHDR), ("%s: !PKTHDR", __func__));
+		M_ASSERTPKTHDR(m);
 
 		/* Find IP address for receive interface */
 		TAILQ_FOREACH(ifa, &m->m_pkthdr.rcvif->if_addrhead, ifa_link) {
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index e26cc8d..5cf4ff4 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -334,8 +334,7 @@ ip_input(struct mbuf *m)
 		}
 	}
 
-	KASSERT(m != NULL && (m->m_flags & M_PKTHDR) != 0,
-	    ("ip_input: no HDR"));
+	M_ASSERTPKTHDR(m);
 
 	if (args.rule) {	/* dummynet already filtered us */
 		ip = mtod(m, struct ip *);
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c
index 8c7d890..5abf2ee 100644
--- a/sys/netinet/ip_mroute.c
+++ b/sys/netinet/ip_mroute.c
@@ -1827,8 +1827,7 @@ X_rsvp_input(struct mbuf *m, int off)
 	printf("rsvp_input: check vifs\n");
 
 #ifdef DIAGNOSTIC
-    if (!(m->m_flags & M_PKTHDR))
-	panic("rsvp_input no hdr");
+    M_ASSERTPKTHDR(m);
 #endif
 
     ifp = m->m_pkthdr.rcvif;
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index 478a0d5..c303c93 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -199,7 +199,7 @@ ip_output(m0, opt, ro, flags, imo, inp)
 	}
 	m = m0;
 
-	KASSERT(!m || (m->m_flags & M_PKTHDR) != 0, ("ip_output: no HDR"));
+	M_ASSERTPKTHDR(m);
 #ifndef FAST_IPSEC
 	KASSERT(ro != NULL, ("ip_output: no route, proto %d",
 	    mtod(m, struct ip *)->ip_p));