summaryrefslogtreecommitdiff
path: root/proto_vlan.c
diff options
context:
space:
mode:
authorDaniel Borkmann <dborkman@redhat.com>2013-07-03 21:29:13 +0200
committerDaniel Borkmann <dborkman@redhat.com>2013-07-03 21:29:13 +0200
commitcfa76744cb9cea2649b0155b1bbdd0233a814307 (patch)
treef428feb73e577a9207a16bfb4fd818a95809eb24 /proto_vlan.c
parent489e84be7639caeb246b2dbaccd2a6e9fda9d2a5 (diff)
dev: linktype: use ARPHRD_ETHER for "any" device
Use ARPHRD_ETHER for the "any" device, so that when typing "netsniff-ng" without any arguments, ethernet is assumed. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Diffstat (limited to 'proto_vlan.c')
0 files changed, 0 insertions, 0 deletions
t-subject'>Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe: "A set of fixes for this series. This contains: - Set of fixes for the nvme target code - A revert of patch from this merge window, causing a regression with WRITE_SAME on iSCSI targets at least. - A fix for a use-after-free in the new O_DIRECT bdev code. - Two fixes for the xen-blkfront driver" * 'for-linus' of git://git.kernel.dk/linux-block: Revert "sd: remove __data_len hack for WRITE SAME" nvme-fc: use blk_rq_nr_phys_segments nvmet-rdma: Fix missing dma sync to nvme data structures nvmet: Call fatal_error from keep-alive timout expiration nvmet: cancel fatal error and flush async work before free controller nvmet: delete controllers deletion upon subsystem release nvmet_fc: correct logic in disconnect queue LS handling block: fix use after free in __blkdev_direct_IO xen-blkfront: correct maximum segment accounting xen-blkfront: feature flags handling adjustments
Diffstat (limited to 'tools/perf/.gitignore')