summaryrefslogtreecommitdiff
path: root/dissector_fuzz.sh
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 /dissector_fuzz.sh
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 'dissector_fuzz.sh')
0 files changed, 0 insertions, 0 deletions
ble>
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/irda/irda_device.c')