diff options
| author |   David S. Miller <davem@davemloft.net> | 2016-08-17 19:22:13 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-08-17 19:22:13 -0400 |
| commit | 00062a934b7d0c6c5a1a4d774abdba6ebf3af81e (patch) | |
| tree | 5319fbee0cf656f4d6af6af6fc56c2aa8a9ac306 /net/batman-adv/netlink.h | |
| parent | Merge branch 'dsa-abstract-PHY-access' (diff) | |
| parent | batman-adv: Indicate netlink socket can be used with netns. (diff) | |
| download | linux-dev-00062a934b7d0c6c5a1a4d774abdba6ebf3af81e.tar.xz linux-dev-00062a934b7d0c6c5a1a4d774abdba6ebf3af81e.zip | |
Merge tag 'batadv-next-for-davem-20160816' of git://git.open-mesh.org/linux-merge
Simon Wunderlich says:
====================
pull request for net-next: batman-adv 2016-08-16
This feature patchset is all about adding netlink support, which should
supersede our debugfs configuration interface in the long run. It is
especially necessary when batman-adv should be used in different
namespaces, since debugfs can not differentiate between those.
More specifically, the following changes are included:
- Two fixes for namespace handling by Andrew Lunn, checking also the
namespaces for parent interfaces, and supress debugfs entries
for non-default netns
- Implement various netlink commands for the new interface, by
Matthias Schiffer, Andrew Lunn, Sven Eckelmann and Simon Wunderlich
(13 patches):
* routing algorithm list
* hardif list
* translation tables (local and global)
* TTVN for the translation tables
* originator and neighbor tables for B.A.T.M.A.N. IV
and B.A.T.M.A.N. V
* gateway dump functionality for B.A.T.M.A.N. IV
and B.A.T.M.A.N. V
* Bridge Loop Avoidance claims, and corresponding BLA group
* Bridge Loop Avoidance backbone tables
- Finally, mark batman-adv as netns compatible, by Andrew Lunn (1 patch)
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv/netlink.h')
| -rw-r--r-- | net/batman-adv/netlink.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/batman-adv/netlink.h b/net/batman-adv/netlink.h index 945653ab58c6..52eb16281aba 100644 --- a/net/batman-adv/netlink.h +++ b/net/batman-adv/netlink.h @@ -21,12 +21,18 @@ #include "main.h" #include <linux/types.h> +#include <net/genetlink.h> + +struct nlmsghdr; void batadv_netlink_register(void); void batadv_netlink_unregister(void); +int batadv_netlink_get_ifindex(const struct nlmsghdr *nlh, int attrtype); int batadv_netlink_tpmeter_notify(struct batadv_priv *bat_priv, const u8 *dst, u8 result, u32 test_time, u64 total_bytes, u32 cookie); +extern struct genl_family batadv_netlink_family; + #endif /* _NET_BATMAN_ADV_NETLINK_H_ */ |