From: David S. Miller Date: Thu, 25 Apr 2013 05:22:53 +0000 (-0400) Subject: Merge branch 'af_packet-timestamp' X-Git-Tag: Ubuntu-5.0.0-8.9~13828^2~37 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=660f7d22298ceb82facd2088c197f2de5cbfb7d6;p=mirror_ubuntu-disco-kernel.git 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 --- 660f7d22298ceb82facd2088c197f2de5cbfb7d6