diff options
author | David S. Miller <davem@davemloft.net> | 2018-09-19 20:35:37 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-09-19 20:35:37 -0700 |
commit | 18522108d53c5d34d270ecdd693d2f1fa1ed845c (patch) | |
tree | 5efa713189b00721db1a75d786676042074c54fd /net/batman-adv/debugfs.h | |
parent | net: wan: remove redundant include (diff) | |
parent | batman-adv: Enable LockLess TX for softif (diff) | |
download | linux-dev-18522108d53c5d34d270ecdd693d2f1fa1ed845c.tar.xz linux-dev-18522108d53c5d34d270ecdd693d2f1fa1ed845c.zip |
Merge tag 'batadv-next-for-davem-20180919' of git://git.open-mesh.org/linux-merge
Simon Wunderlich says:
====================
This feature/cleanup patchset includes the following patches:
- bump version strings, by Simon Wunderlich
- Inform users about debugfs interface deprecation, by Sven Eckelmann
- Implement tracing, planned to replace debugfs log messages,
by Sven Eckelmann
- Move OGM rebroadcasts to per interface struct, by Sven Eckelmann
- Enable LockLess TX to increase throughput, by Sven Eckelmann
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv/debugfs.h')
-rw-r--r-- | net/batman-adv/debugfs.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/batman-adv/debugfs.h b/net/batman-adv/debugfs.h index 08a592ffbee5..8de018e5c577 100644 --- a/net/batman-adv/debugfs.h +++ b/net/batman-adv/debugfs.h @@ -21,12 +21,14 @@ #include "main.h" +struct file; struct net_device; #define BATADV_DEBUGFS_SUBDIR "batman_adv" #if IS_ENABLED(CONFIG_BATMAN_ADV_DEBUGFS) +void batadv_debugfs_deprecated(struct file *file, const char *alt); void batadv_debugfs_init(void); void batadv_debugfs_destroy(void); int batadv_debugfs_add_meshif(struct net_device *dev); @@ -38,6 +40,10 @@ void batadv_debugfs_del_hardif(struct batadv_hard_iface *hard_iface); #else +static inline void batadv_debugfs_deprecated(struct file *file, const char *alt) +{ +} + static inline void batadv_debugfs_init(void) { } |