tree 1a4ed4a6daafe1c1c2cc8da74f3e8432e7aa4a11
parent 4d95b72f61432cb2cb5bc0f65018d0a6c2201c81
parent 62f64aed622b6055b5fc447e3e421c9351563fc8
author David S. Miller <davem@davemloft.net> 1431224766 -0400
committer David S. Miller <davem@davemloft.net> 1431224766 -0400

Merge branch 'pktgen-next'

Jesper Dangaard Brouer says:

====================
The following series introduce some pktgen changes

Patch01:
 Cleanup my own work when I introduced NO_TIMESTAMP.

Patch02:
 Took over patch from Alexei, and addressed my own concerns, as Alexie
 is too busy with other work, and this will provide an easy tool for
 measuring ingress path performance, which is a hot topic ATM.

 Changes were primarily user interface related.  Introduced a separate
 "xmit_mode" setting, instead of stealing one of the dev flags like
 Alexei did.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>