Merge remote-tracking branch 'net-next/master'

[deliverable/linux.git] / net / batman-adv / netlink.h

diff --git a/net/batman-adv/netlink.h b/net/batman-adv/netlink.h
index 945653ab58c60b34d192c18ed3dada91b6feef0b..52eb16281aba7aae5d0c314f21375dabc9a6bf25 100644 (file)
--- 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_ */