tree 2413117b5a07e3632a392e4f03a76ebb37e9c157
parent 92dea7c06656f709a3957aacef20574ce3dbe6fc
parent 2940b26bec9fe5bf183c994678e62b55d35717e6
author David S. Miller <davem@davemloft.net> 1366867373 -0400
committer David S. Miller <davem@davemloft.net> 1366867373 -0400

Merge branch 'af_packet-timestamp'

Daniel Borkmann says:

====================
This is a joint effort with Willem to bring optional i) tx hw/sw
timestamping into PF_PACKET, that was reported by Paul Chavent,
and ii) to expose the type of timestamp to the user, which is in
the current situation not possible to distinguish with the RX_RING
and TX_RING API (but distinguishable through the normal timestamping
API), reported by Richard Cochran. This set is based on top of
``packet: account statistics only in tpacket_stats_u''. Related
discussion can be found in: http://patchwork.ozlabs.org/patch/238125/
====================

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