summaryrefslogtreecommitdiff
path: root/geoip.conf
diff options
context:
space:
mode:
authorDaniel Borkmann <dborkman@redhat.com>2013-07-23 13:15:49 +0200
committerDaniel Borkmann <dborkman@redhat.com>2013-07-23 13:15:49 +0200
commitab84e1e6491030806cd771939d445f3c9e9bacfe (patch)
treeff1feec4b67a088396e599e69659ad1aff48b832 /geoip.conf
parent57e04d5a77cc9541ad8dcb81a134644ed2a640be (diff)
pcap_io: tun: support captures from wireshark/tcpdump via tun devices
101-103 do not have official link types and seem to be non-portable. Just add them so that we can replay pcap's of such types as well. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Diffstat (limited to 'geoip.conf')
0 files changed, 0 insertions, 0 deletions
sh/kernel?h=nds-private-remove&id=6989606a7224a2d5a925df22a49e4f7a0bfed0d6&id2=be29d20f3f5db1f0b4e49a4f6eeedf840e2bf9b1'>diff)
Merge branch 'stable-4.10' of git://git.infradead.org/users/pcmoore/audit
Pull audit fixes from Paul Moore: "Two small fixes relating to audit's use of fsnotify. The first patch plugs a leak and the second fixes some lock shenanigans. The patches are small and I banged on this for an afternoon with our testsuite and didn't see anything odd" * 'stable-4.10' of git://git.infradead.org/users/pcmoore/audit: audit: Fix sleep in atomic fsnotify: Remove fsnotify_duplicate_mark()
Diffstat (limited to 'arch/sh/kernel')