diff options
| author | des <des@FreeBSD.org> | 2003-04-08 14:25:47 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2003-04-08 14:25:47 +0000 |
| commit | 567ac2b268739a751df819d1aa68404f430151cb (patch) | |
| tree | a9d6dfe9fba9afa35e60736c6acc2bb7970ecd0a /sys/netgraph | |
| parent | e105056ea61ca6ae4a0e93115e8916181e93be8b (diff) | |
| download | FreeBSD-src-567ac2b268739a751df819d1aa68404f430151cb.zip FreeBSD-src-567ac2b268739a751df819d1aa68404f430151cb.tar.gz | |
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>
Diffstat (limited to 'sys/netgraph')
| -rw-r--r-- | sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c | 6 | ||||
| -rw-r--r-- | sys/netgraph/ng_base.c | 3 | ||||
| -rw-r--r-- | sys/netgraph/ng_iface.c | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c b/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c index 2221f44..d8da877 100644 --- a/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c +++ b/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c @@ -451,8 +451,7 @@ ng_btsocket_hci_raw_data_input(struct mbuf *nam) KASSERT((nam->m_type == MT_SONAME), ("%s: m_type=%d\n", __func__, nam->m_type)); - KASSERT((m0->m_flags & M_PKTHDR), - ("%s: m_flags=%#x\n", __func__, m0->m_flags)); + M_ASSERTPKTHDR(m0); sa = mtod(nam, struct sockaddr_hci *); @@ -614,8 +613,7 @@ ng_btsocket_hci_raw_output(node_p node, hook_p hook, void *arg1, int arg2) KASSERT((nam->m_type == MT_SONAME), ("%s: m_type=%d\n", __func__, nam->m_type)); - KASSERT((m->m_flags & M_PKTHDR), - ("%s: m_flags=%#x\n", __func__, m->m_flags)); + M_ASSERTPKTHDR(m); sa = mtod(nam, struct sockaddr_hci *); diff --git a/sys/netgraph/ng_base.c b/sys/netgraph/ng_base.c index efa0e03..786eecd 100644 --- a/sys/netgraph/ng_base.c +++ b/sys/netgraph/ng_base.c @@ -335,8 +335,7 @@ static ng_ID_t nextID = 1; struct mbuf *n; \ int total; \ \ - if (((m)->m_flags & M_PKTHDR) == 0) \ - panic("%s: !PKTHDR", __func__); \ + M_ASSERTPKTHDR(m); \ for (total = 0, n = (m); n != NULL; n = n->m_next) \ total += n->m_len; \ if ((m)->m_pkthdr.len != total) { \ diff --git a/sys/netgraph/ng_iface.c b/sys/netgraph/ng_iface.c index 07968ff..3aa34f2 100644 --- a/sys/netgraph/ng_iface.c +++ b/sys/netgraph/ng_iface.c @@ -739,7 +739,7 @@ ng_iface_rcvdata(hook_p hook, item_p item) NG_FREE_ITEM(item); /* Sanity checks */ KASSERT(iffam != NULL, ("%s: iffam", __func__)); - KASSERT(m->m_flags & M_PKTHDR, ("%s: not pkthdr", __func__)); + M_ASSERTPKTHDR(m); if (m == NULL) return (EINVAL); if ((ifp->if_flags & IFF_UP) == 0) { |
