Date: Tue, 29 Jan 2013 07:30:51 +0000 (UTC) From: Bryan Venteicher <bryanv@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r246058 - projects/virtio/sys/dev/virtio/network Message-ID: <201301290730.r0T7UpZK006292@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bryanv Date: Tue Jan 29 07:30:50 2013 New Revision: 246058 URL: http://svnweb.freebsd.org/changeset/base/246058 Log: vtnet: Move an mbuf ASSERT to the calling function Approved by: grehan (implicit) Modified: projects/virtio/sys/dev/virtio/network/if_vtnet.c Modified: projects/virtio/sys/dev/virtio/network/if_vtnet.c ============================================================================== --- projects/virtio/sys/dev/virtio/network/if_vtnet.c Tue Jan 29 07:21:50 2013 (r246057) +++ projects/virtio/sys/dev/virtio/network/if_vtnet.c Tue Jan 29 07:30:50 2013 (r246058) @@ -1747,7 +1747,6 @@ vtnet_tx_offload(struct vtnet_softc *sc, uint8_t ip_proto, gso_type; ifp = sc->vtnet_ifp; - M_ASSERTPKTHDR(m); ip_offset = sizeof(struct ether_header); if (m->m_len < ip_offset) { @@ -1902,6 +1901,7 @@ vtnet_encap(struct vtnet_softc *sc, stru int error; m = *m_head; + M_ASSERTPKTHDR(m); txhdr = uma_zalloc(vtnet_tx_header_zone, M_NOWAIT | M_ZERO); if (txhdr == NULL) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301290730.r0T7UpZK006292>