diff options
| author | luigi <luigi@FreeBSD.org> | 2002-04-04 05:42:09 +0000 |
|---|---|---|
| committer | luigi <luigi@FreeBSD.org> | 2002-04-04 05:42:09 +0000 |
| commit | 55510cb673dc4635f4bc6393c11f3d63f6d00ed6 (patch) | |
| tree | 5169d68ccee6707c197fe9453bd1ece3b92a55b2 /sys/net/ethernet.h | |
| parent | 1802268e809bb1895682a238b5d7c63858a55166 (diff) | |
| download | FreeBSD-src-55510cb673dc4635f4bc6393c11f3d63f6d00ed6.zip FreeBSD-src-55510cb673dc4635f4bc6393c11f3d63f6d00ed6.tar.gz | |
Fix a couple of incorrect m_free() vs. m_freem() usages and related issues.
Reviewed-by: brooks
Diffstat (limited to 'sys/net/ethernet.h')
| -rw-r--r-- | sys/net/ethernet.h | 38 |
1 files changed, 9 insertions, 29 deletions
diff --git a/sys/net/ethernet.h b/sys/net/ethernet.h index ca6325a..826363d 100644 --- a/sys/net/ethernet.h +++ b/sys/net/ethernet.h @@ -102,36 +102,16 @@ extern void (*ng_ether_detach_p)(struct ifnet *ifp); extern int (*vlan_input_p)(struct ether_header *eh, struct mbuf *m); extern int (*vlan_input_tag_p)(struct ether_header *eh, struct mbuf *m, u_int16_t t); -#define _VLAN_INPUT(eh, m) do { \ - if (vlan_input_p != NULL) { \ - if ((*vlan_input_p)(eh, m) == -1) \ - (m)->m_pkthdr.rcvif->if_noproto++; \ - } else { \ - m_free(m); \ - (m)->m_pkthdr.rcvif->if_noproto++; \ - } \ -} while (0) - -#define VLAN_INPUT(eh, m) do { \ - /* XXX: lock */ \ - _VLAN_INPUT(eh, m); \ - /* XXX: unlock */ \ -} while (0) - -#define _VLAN_INPUT_TAG(eh, m, t) do { \ - if (vlan_input_tag_p != NULL) { \ - if ((*vlan_input_tag_p)(eh, m, t) == -1) \ - (m)->m_pkthdr.rcvif->if_noproto++; \ - } else { \ - m_free(m); \ - (m)->m_pkthdr.rcvif->if_noproto++; \ - } \ -} while (0) -#define VLAN_INPUT_TAG(eh, m, t) do { \ - /* XXX: lock */ \ - _VLAN_INPUT_TAG(eh, m, t); \ - /* XXX: unlock */ \ +#define VLAN_INPUT_TAG(eh, m, t) do { \ + /* XXX: lock */ \ + if (vlan_input_tag_p != NULL) \ + (*vlan_input_tag_p)(eh, m, t); \ + else { \ + (m)->m_pkthdr.rcvif->if_noproto++; \ + m_freem(m); \ + } \ + /* XXX: unlock */ \ } while (0) #else /* _KERNEL */ |
