summaryrefslogtreecommitdiff
path: root/astraceroute/Makefile
diff options
context:
space:
mode:
authorDaniel Borkmann <dborkman@redhat.com>2013-07-03 17:41:04 +0200
committerDaniel Borkmann <dborkman@redhat.com>2013-07-03 17:41:04 +0200
commiteaa0a2777dc29e5f701efbc037b303b52f3e08be (patch)
tree7edaa21a58c0ae9aac7524c4b6210ffe97a73920 /astraceroute/Makefile
parentc2dd1b3f2f459b90ed16600bcd5aa0369610e80e (diff)
pcap: invoke dev->type to pcap linktype mapper
Invoke dev->type to pcap linktype mapper in order to write a correct pcap file header for various link types. Also fix two bugs in pcap file header parsing and print a warning with the magic link number in case of an unknown link type. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Diffstat (limited to 'astraceroute/Makefile')
0 files changed, 0 insertions, 0 deletions
/a> (diff)
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer type cleanups from Thomas Gleixner: "This series does a tree wide cleanup of types related to timers/timekeeping. - Get rid of cycles_t and use a plain u64. The type is not really helpful and caused more confusion than clarity - Get rid of the ktime union. The union has become useless as we use the scalar nanoseconds storage unconditionally now. The 32bit timespec alike storage got removed due to the Y2038 limitations some time ago. That leaves the odd union access around for no reason. Clean it up. Both changes have been done with coccinelle and a small amount of manual mopping up" * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: ktime: Get rid of ktime_equal() ktime: Cleanup ktime_set() usage ktime: Get rid of the union clocksource: Use a plain u64 instead of cycle_t
Diffstat (limited to 'include/net/bluetooth/l2cap.h')