svn commit: r252706 - head/sys/dev/virtio/network

[Bryan Venteicher]

Author: bryanv
Date: Thu Jul  4 17:55:58 2013
New Revision: 252706
URL: http://svnweb.freebsd.org/changeset/base/252706

Log:
  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

Modified:
  head/sys/dev/virtio/network/if_vtnet.c

Modified: head/sys/dev/virtio/network/if_vtnet.c
==============================================================================
--- head/sys/dev/virtio/network/if_vtnet.c	Thu Jul  4 17:55:52 2013	(r252705)
+++ head/sys/dev/virtio/network/if_vtnet.c	Thu Jul  4 17:55:58 2013	(r252706)
@@ -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) {
@@ -1865,7 +1864,7 @@ vtnet_enqueue_txbuf(struct vtnet_softc *
 	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, stru
 	int error;
 
 	m = *m_head;
+	M_ASSERTPKTHDR(m);
 
 	txhdr = uma_zalloc(vtnet_tx_header_zone, M_NOWAIT | M_ZERO);
 	if (txhdr == NULL) {