jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-12-03 14:48:57 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

m_pullup() frees the supplied mbuf on failure; we don't need to try

Browse Source 
and do this ourselves.

Approved by:	jkh
Noticed by:	Mike Spengler <mks@networkcs.com>
This commit is contained in:
Matthew N. Dodd 2000-02-07 06:18:38 +00:00
parent 92c9724fe4
commit 5326b23cd6
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=57020
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/net/if_vlan.c
View File

@ -193,7 +193,7 @@ vlan_start(struct ifnet *ifp)
struct ifvlan *ifv;
struct ifnet *p;
struct ether_vlan_header *evl;
struct mbuf *m, *m0;
struct mbuf *m;
ifv = ifp->if_softc;
p = ifv->ifv_p;
@ -236,14 +236,12 @@ vlan_start(struct ifnet *ifp)
}
/* M_PREPEND takes care of m_len, m_pkthdr.len for us */
m0 = m_pullup(m, ETHER_HDR_LEN + EVL_ENCAPLEN);
if (m0 == NULL) {
m = m_pullup(m, ETHER_HDR_LEN + EVL_ENCAPLEN);
if (m == NULL) {
printf("vlan%d: m_pullup failed", ifp->if_unit);
ifp->if_ierrors++;
m_freem(m);
continue;
}
m = m0;
/*
* Transform the Ethernet header into an Ethernet header