/* * netsniff-ng - the packet sniffing beast * Copyright 2009, 2010 Daniel Borkmann. * Subject to the GPL, version 2. */ #ifndef DISSECTOR_80211_H #define DISSECTOR_80211_H #include "hash.h" #include "protos.h" extern struct hash_table ieee80211_lay2; extern void dissector_init_ieee80211(int fnttype); extern void dissector_cleanup_ieee80211(void); static inline struct protocol *dissector_get_ieee80211_entry_point(void) { return &ieee80211_ops; } static inline struct protocol *dissector_get_ieee80211_exit_point(void) { return &none_ops; } #endif /* DISSECTOR_80211_H */ nux/net-next.git' title='net-next.git Git repository'/>
summaryrefslogtreecommitdiff
path: root/net/llc/llc_input.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-02-07 16:29:30 -0500
committerDavid S. Miller <davem@davemloft.net>2017-02-07 16:29:30 -0500
commit3efa70d78f218e4c9276b0bac0545e5184c1c47b (patch)
treef4abe2f05e173023d2a262afd4aebb1e89fe6985 /net/llc/llc_input.c
parent76e0e70e6452b971a69cc9794ff4a6715c11f7f2 (diff)
parent926af6273fc683cd98cd0ce7bf0d04a02eed6742 (diff)
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/llc/llc_input.c')