diff options
| author | bryanv <bryanv@FreeBSD.org> | 2013-07-04 17:55:58 +0000 |
|---|---|---|
| committer | bryanv <bryanv@FreeBSD.org> | 2013-07-04 17:55:58 +0000 |
| commit | e56d87e5498bf6002856c59cb2e6bc32d5f9a555 (patch) | |
| tree | 900bb539186b989f05494a608eba04e7b53e3e9c /sys/dev/virtio/network | |
| parent | e6e5075ec544e10414ab3dac12178c6f1db9823f (diff) | |
| download | FreeBSD-src-e56d87e5498bf6002856c59cb2e6bc32d5f9a555.zip FreeBSD-src-e56d87e5498bf6002856c59cb2e6bc32d5f9a555.tar.gz | |
Merge vtnet changes from projects/virtio
Minor changes to the network driver. A multiqueue driver that is
a significant rewrite will be in merged shortly.
Contains projects/virtio commits:
r246058:
vtnet: Move an mbuf ASSERT to the calling function
r246059:
vtnet: Tweak ASSERT message
MFC after: 1 month
Diffstat (limited to 'sys/dev/virtio/network')
| -rw-r--r-- | sys/dev/virtio/network/if_vtnet.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c index 29ed747..329614a 100644 --- a/sys/dev/virtio/network/if_vtnet.c +++ b/sys/dev/virtio/network/if_vtnet.c @@ -1747,7 +1747,6 @@ vtnet_tx_offload(struct vtnet_softc *sc, struct mbuf *m, 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) { @@ -1865,7 +1864,7 @@ vtnet_enqueue_txbuf(struct vtnet_softc *sc, struct mbuf **m_head, sglist_init(&sg, VTNET_MAX_TX_SEGS, segs); error = sglist_append(&sg, &txhdr->vth_uhdr, sc->vtnet_hdr_size); KASSERT(error == 0 && sg.sg_nseg == 1, - ("cannot add header to sglist")); + ("%s: cannot add header to sglist error %d", __func__, error)); again: error = sglist_append_mbuf(&sg, m); @@ -1902,6 +1901,7 @@ vtnet_encap(struct vtnet_softc *sc, struct mbuf **m_head) int error; m = *m_head; + M_ASSERTPKTHDR(m); txhdr = uma_zalloc(vtnet_tx_header_zone, M_NOWAIT | M_ZERO); if (txhdr == NULL) { |
