/*
* netsniff-ng - the packet sniffing beast
* Copyright 2009, 2010 Daniel Borkmann.
* Subject to the GPL, version 2.
*/
#ifndef DISSECTOR_ETH_H
#define DISSECTOR_ETH_H
#include "hash.h"
#include "protos.h"
extern struct hash_table eth_lay2;
extern struct hash_table eth_lay3;
extern void dissector_init_ethernet(int fnttype);
extern void dissector_cleanup_ethernet(void);
#ifdef HAVE_DISSECTOR_PROTOS
static inline struct protocol *dissector_get_ethernet_entry_point(void)
{
return ðernet_ops;
}
static inline struct protocol *dissector_get_ethernet_exit_point(void)
{
return &none_ops;
}
#else
static inline struct protocol *dissector_get_ethernet_entry_point(void)
{
return NULL;
}
static inline struct protocol *dissector_get_ethernet_exit_point(void)
{
return NULL;
}
#endif
#endif /* DISSECTOR_ETH_H */
net-next.git
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