summaryrefslogtreecommitdiff
path: root/bpfc
diff options
context:
space:
mode:
authorDaniel Borkmann <dborkman@redhat.com>2013-07-03 16:53:42 +0200
committerDaniel Borkmann <dborkman@redhat.com>2013-07-03 16:53:42 +0200
commitf5c10ae4e3cc56eb0a8662c39442146415cc2df4 (patch)
treede2f6dd1a8aca9d9d62876c748d7bef7796ef888 /bpfc
parent2bcc60885d8dc61d49608cf9125a2432607631b1 (diff)
dissector: do not panic on unknown hatype
Do not panic on linktypes that are unknown to us. Just skip the usual dissector entry point and based on user input, print in hex, ascii, or hex + ascii. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Diffstat (limited to 'bpfc')
0 files changed, 0 insertions, 0 deletions
18843e511193e7eb616710e838f5852e661d'>3b4f18843e511193e7eb616710e838f5852e661d (diff)
Merge branch 'stable/for-jens-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into for-linus
Konrad writes: Please pull in your 'for-linus' branch two little fixes for Xen block front: One fix is for handling the XEN_PAGE_SIZE != PAGE_SIZE (4KB vs 64KB on ARM for example) mishandling while the other is fixing the accounting for the configuration changes.
Diffstat (limited to 'net/ipv4/ip_tunnel.c')