CVSROOT:        /cvs
Module name:    src
Changes by:     b...@cvs.openbsd.org    2013/12/07 00:22:37

Modified files:
        sys/dev/pci    : if_jme.c if_jmevar.h 

Log message:
Some fixes for jme_encap()..

- Remove the maximum DMA segments handling bits as it is unused between
DragonFly and OpenBSD.
- Fix error handling for bus_dmamap_load_mbuf() so as to not try unloading
a DMA map that had not already been loaded.
- Clean up the DMA chain defragmenting path to remove unwanted printfs and
simplify things a bit.
- Have jme_encap() check the number of mapped DMA segments against the TX
ring to see if it'll fit as do most of the driver nowadays.
- Remove the KASSERT's that shouldn't be there.
- Simplify the dummy descriptor handling to be closer to the FreeBSD
driver since unlike the DragonFly driver this originated from our
driver always uses the 64-bit dummy descriptor.
- If the ring was full make sure to IF_PREPEND() the packet back on
the queue since it wasn't transmitted.

Tested by myself, com...@daknet.org and vigdis+o...@chown.me.

Reply via email to