Merge branch 'af_packet-timestamp'

Browse source

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>

...

This commit is contained in:

David S. Miller 2013-04-25 01:22:53 -04:00

parent 92dea7c066 2940b26bec

commit 660f7d2229

4 changed files with 122 additions and 45 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

41

Documentation/networking/packet_mmap.txt

View file

27

include/uapi/linux/if_packet.h

View file

12

net/core/skbuff.c

View file

87

net/packet/af_packet.c

View file