mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-17 15:27:36 +00:00
Code Issues Releases Activity

Check for non-NULL ac_netgraph field in interface arpcom, instead of

Browse Source 
checking global presence of ng_ether(4).

Reviewed by:	ru
This commit is contained in:
Gleb Smirnoff 2005-02-14 11:58:54 +00:00
parent ed61386604
commit eb46c866bb
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=141909
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/net/if_ethersubr.c
View File

@ -316,7 +316,7 @@ ether_output(struct ifnet *ifp, struct mbuf *m,
}
/* Handle ng_ether(4) processing, if any */
if (ng_ether_output_p != NULL) {
if (IFP2AC(ifp)->ac_netgraph != NULL) {
if ((error = (*ng_ether_output_p)(ifp, &m)) != 0) {
bad: if (m != NULL)
m_freem(m);
@ -560,7 +560,7 @@ ether_input(struct ifnet *ifp, struct mbuf *m)
ifp->if_ibytes += m->m_pkthdr.len;
/* Handle ng_ether(4) processing, if any */
if (ng_ether_input_p != NULL) {
if (IFP2AC(ifp)->ac_netgraph != NULL) {
(*ng_ether_input_p)(ifp, &m);
if (m == NULL)
return;
@ -777,7 +777,7 @@ ether_demux(struct ifnet *ifp, struct mbuf *m)
* hand the packet to it for last chance processing;
* otherwise dispose of it.
*/
if (ng_ether_input_orphan_p != NULL) {
if (IFP2AC(ifp)->ac_netgraph != NULL) {
/*
* Put back the ethernet header so netgraph has a
* consistent view of inbound packets.
@ -862,7 +862,7 @@ ether_ifattach(struct ifnet *ifp, const u_int8_t *llc)
void
ether_ifdetach(struct ifnet *ifp)
{
if (ng_ether_detach_p != NULL)
if (IFP2AC(ifp)->ac_netgraph != NULL)
(*ng_ether_detach_p)(ifp);
bpfdetach(ifp);
if_detach(ifp);