aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Eckelmann <sven@narfation.org>2016-07-03 07:31:46 -0400
committerSimon Wunderlich <sw@simonwunderlich.de>2016-08-09 01:54:42 -0400
commit8dad6f0db6b4457b1c4b04d4edf62744921c32fd (patch)
tree5b20d73c5d789bf496a208fce8c920846098da13
parent04f3f5bf1883fbe0acba5c1fc698cf5cedebc5c5 (diff)
batman-adv: Provide bla group in the mesh_info netlink msg
The bridge loop avoidange is the main information for the debugging of of bridge loop detection problems. It is therefore necessary when comparing the bla claim tables. Signed-off-by: Sven Eckelmann <sven@narfation.org> Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de> Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
-rw-r--r--net/batman-adv/netlink.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c
index b33675cbaecf..464de9d05135 100644
--- a/net/batman-adv/netlink.c
+++ b/net/batman-adv/netlink.c
@@ -19,6 +19,7 @@
19#include "main.h" 19#include "main.h"
20 20
21#include <linux/atomic.h> 21#include <linux/atomic.h>
22#include <linux/byteorder/generic.h>
22#include <linux/errno.h> 23#include <linux/errno.h>
23#include <linux/fs.h> 24#include <linux/fs.h>
24#include <linux/genetlink.h> 25#include <linux/genetlink.h>
@@ -42,6 +43,7 @@
42#include "gateway_client.h" 43#include "gateway_client.h"
43#include "hard-interface.h" 44#include "hard-interface.h"
44#include "originator.h" 45#include "originator.h"
46#include "packet.h"
45#include "soft-interface.h" 47#include "soft-interface.h"
46#include "tp_meter.h" 48#include "tp_meter.h"
47#include "translation-table.h" 49#include "translation-table.h"
@@ -141,6 +143,12 @@ batadv_netlink_mesh_info_put(struct sk_buff *msg, struct net_device *soft_iface)
141 (u8)atomic_read(&bat_priv->tt.vn))) 143 (u8)atomic_read(&bat_priv->tt.vn)))
142 goto out; 144 goto out;
143 145
146#ifdef CONFIG_BATMAN_ADV_BLA
147 if (nla_put_u16(msg, BATADV_ATTR_BLA_CRC,
148 ntohs(bat_priv->bla.claim_dest.group)))
149 goto out;
150#endif
151
144 primary_if = batadv_primary_if_get_selected(bat_priv); 152 primary_if = batadv_primary_if_get_selected(bat_priv);
145 if (primary_if && primary_if->if_status == BATADV_IF_ACTIVE) { 153 if (primary_if && primary_if->if_status == BATADV_IF_ACTIVE) {
146 hard_iface = primary_if->net_dev; 154 hard_iface = primary_if->net_dev;