diff options
| author | David S. Miller <davem@davemloft.net> | 2018-07-18 13:50:12 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-07-18 13:50:12 -0700 |
| commit | 9640ccce30055dea452d12172932ad7e07b59976 (patch) | |
| tree | 70fba612556fc63479bec5a6d57904b0c68862b5 /net/batman-adv/debugfs.h | |
| parent | 53189183909f392c2aff1177565eabbfc48b8524 (diff) | |
| parent | a44ebeff6bbd6ef50db41b4195fca87b21aefd20 (diff) | |
| download | linux-9640ccce30055dea452d12172932ad7e07b59976.tar.bz2 | |
Merge tag 'batadv-net-for-davem-20180717' of git://git.open-mesh.org/linux-merge
Simon Wunderlich says:
====================
Here are some batman-adv fixes:
- Fix gateway refcounting in BATMAN IV and V, by Sven Eckelmann (2 patches)
- Fix debugfs paths when renaming interfaces, by Sven Eckelmann (2 patches)
- Fix TT flag issues, by Linus Luessing (2 patches)
====================
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 | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/net/batman-adv/debugfs.h b/net/batman-adv/debugfs.h index 37b069698b04..08a592ffbee5 100644 --- a/net/batman-adv/debugfs.h +++ b/net/batman-adv/debugfs.h @@ -30,8 +30,10 @@ struct net_device; void batadv_debugfs_init(void); void batadv_debugfs_destroy(void); int batadv_debugfs_add_meshif(struct net_device *dev); +void batadv_debugfs_rename_meshif(struct net_device *dev); void batadv_debugfs_del_meshif(struct net_device *dev); int batadv_debugfs_add_hardif(struct batadv_hard_iface *hard_iface); +void batadv_debugfs_rename_hardif(struct batadv_hard_iface *hard_iface); void batadv_debugfs_del_hardif(struct batadv_hard_iface *hard_iface); #else @@ -49,6 +51,10 @@ static inline int batadv_debugfs_add_meshif(struct net_device *dev) return 0; } +static inline void batadv_debugfs_rename_meshif(struct net_device *dev) +{ +} + static inline void batadv_debugfs_del_meshif(struct net_device *dev) { } @@ -60,6 +66,11 @@ int batadv_debugfs_add_hardif(struct batadv_hard_iface *hard_iface) } static inline +void batadv_debugfs_rename_hardif(struct batadv_hard_iface *hard_iface) +{ +} + +static inline void batadv_debugfs_del_hardif(struct batadv_hard_iface *hard_iface) { } |