d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unconditionally restore the pointer to the saved Ethernet header after

Browse Source 
going to bridge.c:bdg_forward(). The header can be munged even if the
mbuf does not /appear/ to change.

PR:		kern/42465
MFC after:	4 days
This commit is contained in:
Crist J. Clark 2002-10-14 05:27:00 +00:00
parent a5b65058d5
commit 232a880278
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/net/if_ethersubr.c
View File

@ -613,8 +613,6 @@ ether_input(struct ifnet *ifp, struct ether_header *eh, struct mbuf *m)
return;
}
if (bif != BDG_LOCAL) {
struct mbuf *oldm = m ;
save_eh = *eh ; /* because it might change */
m = bdg_forward_ptr(m, eh, bif); /* needs forwarding */
/*
@ -627,8 +625,7 @@ ether_input(struct ifnet *ifp, struct ether_header *eh, struct mbuf *m)
printf("bdg_forward drop MULTICAST PKT\n");
return;
}
if (m != oldm) /* m changed! */
eh = &save_eh ;
eh = &save_eh ;
}
if (bif == BDG_LOCAL
|| bif == BDG_BCAST