Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5332174a authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge 



Antonio Quartulli says:

====================
pull request: batman-adv 20160504

In this pull request you have:
- two changes to the MAINTAINERS file where one marks our mailing list
  as moderated and the other adds a missing documentation file
- kernel-doc fixes
- code refactoring and various cleanups
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e98a3aab 64ae7445

MAINTAINERS

+4 −1
Original line number Diff line number Diff line
@@ -2203,10 +2203,13 @@ BATMAN ADVANCED 
M:	Marek Lindner <mareklindner@neomailbox.ch>

M:	Simon Wunderlich <sw@simonwunderlich.de>

M:	Antonio Quartulli <a@unstable.cc>

L:	b.a.t.m.a.n@lists.open-mesh.org

L:	b.a.t.m.a.n@lists.open-mesh.org (moderated for non-subscribers)

W:	https://www.open-mesh.org/

Q:	https://patchwork.open-mesh.org/project/batman/list/

S:	Maintained

F:	Documentation/ABI/testing/sysfs-class-net-batman-adv

F:	Documentation/ABI/testing/sysfs-class-net-mesh

F:	Documentation/networking/batman-adv.txt

F:	net/batman-adv/



BAYCOM/HDLCDRV DRIVERS FOR AX.25

net/batman-adv/bat_iv_ogm.c

+79 −44
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <linux/jiffies.h>

#include <linux/list.h>

#include <linux/kref.h>

#include <linux/lockdep.h>

#include <linux/netdevice.h>

#include <linux/pkt_sched.h>

#include <linux/printk.h>
@@ -175,71 +176,107 @@ static int batadv_iv_ogm_orig_add_if(struct batadv_orig_node *orig_node, 
}



/**

 * batadv_iv_ogm_orig_del_if - change the private structures of the orig_node to

 *  exclude the removed interface

 * batadv_iv_ogm_drop_bcast_own_entry - drop section of bcast_own

 * @orig_node: the orig_node that has to be changed

 * @max_if_num: the current amount of interfaces

 * @del_if_num: the index of the interface being removed

 *

 * Return: 0 on success, a negative error code otherwise.

 */

static int batadv_iv_ogm_orig_del_if(struct batadv_orig_node *orig_node,

static void

batadv_iv_ogm_drop_bcast_own_entry(struct batadv_orig_node *orig_node,

				   int max_if_num, int del_if_num)

{

	int ret = -ENOMEM;

	size_t chunk_size, if_offset;

	void *data_ptr = NULL;



	spin_lock_bh(&orig_node->bat_iv.ogm_cnt_lock);

	size_t chunk_size;

	size_t if_offset;

	void *data_ptr;



	/* last interface was removed */

	if (max_if_num == 0)

		goto free_bcast_own;

	lockdep_assert_held(&orig_node->bat_iv.ogm_cnt_lock);



	chunk_size = sizeof(unsigned long) * BATADV_NUM_WORDS;

	data_ptr = kmalloc_array(max_if_num, chunk_size, GFP_ATOMIC);

	if (!data_ptr)

		goto unlock;

		/* use old buffer when new one could not be allocated */

		data_ptr = orig_node->bat_iv.bcast_own;



	/* copy first part */

	memcpy(data_ptr, orig_node->bat_iv.bcast_own, del_if_num * chunk_size);

	memmove(data_ptr, orig_node->bat_iv.bcast_own, del_if_num * chunk_size);



	/* copy second part */

	if_offset = (del_if_num + 1) * chunk_size;

	memcpy((char *)data_ptr + del_if_num * chunk_size,

	memmove((char *)data_ptr + del_if_num * chunk_size,

		(uint8_t *)orig_node->bat_iv.bcast_own + if_offset,

		(max_if_num - del_if_num) * chunk_size);



free_bcast_own:

	/* bcast_own was shrunk down in new buffer; free old one */

	if (orig_node->bat_iv.bcast_own != data_ptr) {

		kfree(orig_node->bat_iv.bcast_own);

		orig_node->bat_iv.bcast_own = data_ptr;

	}

}



	if (max_if_num == 0)

		goto free_own_sum;

/**

 * batadv_iv_ogm_drop_bcast_own_sum_entry - drop section of bcast_own_sum

 * @orig_node: the orig_node that has to be changed

 * @max_if_num: the current amount of interfaces

 * @del_if_num: the index of the interface being removed

 */

static void

batadv_iv_ogm_drop_bcast_own_sum_entry(struct batadv_orig_node *orig_node,

				       int max_if_num, int del_if_num)

{

	size_t if_offset;

	void *data_ptr;



	lockdep_assert_held(&orig_node->bat_iv.ogm_cnt_lock);



	data_ptr = kmalloc_array(max_if_num, sizeof(u8), GFP_ATOMIC);

	if (!data_ptr) {

		kfree(orig_node->bat_iv.bcast_own);

		goto unlock;

	}

	if (!data_ptr)

		/* use old buffer when new one could not be allocated */

		data_ptr = orig_node->bat_iv.bcast_own_sum;



	memcpy(data_ptr, orig_node->bat_iv.bcast_own_sum,

	memmove(data_ptr, orig_node->bat_iv.bcast_own_sum,

		del_if_num * sizeof(u8));



	if_offset = (del_if_num + 1) * sizeof(u8);

	memcpy((char *)data_ptr + del_if_num * sizeof(u8),

	memmove((char *)data_ptr + del_if_num * sizeof(u8),

		orig_node->bat_iv.bcast_own_sum + if_offset,

		(max_if_num - del_if_num) * sizeof(u8));



free_own_sum:

	/* bcast_own_sum was shrunk down in new buffer; free old one */

	if (orig_node->bat_iv.bcast_own_sum != data_ptr) {

		kfree(orig_node->bat_iv.bcast_own_sum);

		orig_node->bat_iv.bcast_own_sum = data_ptr;

	}

}



/**

 * batadv_iv_ogm_orig_del_if - change the private structures of the orig_node to

 *  exclude the removed interface

 * @orig_node: the orig_node that has to be changed

 * @max_if_num: the current amount of interfaces

 * @del_if_num: the index of the interface being removed

 *

 * Return: 0 on success, a negative error code otherwise.

 */

static int batadv_iv_ogm_orig_del_if(struct batadv_orig_node *orig_node,

				     int max_if_num, int del_if_num)

{

	spin_lock_bh(&orig_node->bat_iv.ogm_cnt_lock);



	if (max_if_num == 0) {

		kfree(orig_node->bat_iv.bcast_own);

		kfree(orig_node->bat_iv.bcast_own_sum);

		orig_node->bat_iv.bcast_own = NULL;

		orig_node->bat_iv.bcast_own_sum = NULL;

	} else {

		batadv_iv_ogm_drop_bcast_own_entry(orig_node, max_if_num,

						   del_if_num);

		batadv_iv_ogm_drop_bcast_own_sum_entry(orig_node, max_if_num,

						       del_if_num);

	}



	ret = 0;

unlock:

	spin_unlock_bh(&orig_node->bat_iv.ogm_cnt_lock);



	return ret;

	return 0;

}



/**
@@ -1829,9 +1866,8 @@ static void batadv_iv_ogm_orig_print(struct batadv_priv *bat_priv, 
	int batman_count = 0;

	u32 i;



	seq_printf(seq, "  %-15s %s (%s/%i) %17s [%10s]: %20s ...\n",

		   "Originator", "last-seen", "#", BATADV_TQ_MAX_VALUE,

		   "Nexthop", "outgoingIF", "Potential nexthops");

	seq_puts(seq,

		 "  Originator      last-seen (#/255)           Nexthop [outgoingIF]:   Potential nexthops ...\n");



	for (i = 0; i < hash->size; i++) {

		head = &hash->table[i];
@@ -1911,8 +1947,7 @@ static void batadv_iv_neigh_print(struct batadv_priv *bat_priv, 
	struct batadv_hard_iface *hard_iface;

	int batman_count = 0;



	seq_printf(seq, "   %10s        %-13s %s\n",

		   "IF", "Neighbor", "last-seen");

	seq_puts(seq, "           IF        Neighbor      last-seen\n");



	rcu_read_lock();

	list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) {

net/batman-adv/bat_v.c

+4 −5
Original line number Diff line number Diff line
@@ -162,8 +162,8 @@ static void batadv_v_neigh_print(struct batadv_priv *bat_priv, 
	struct batadv_hard_iface *hard_iface;

	int batman_count = 0;



	seq_printf(seq, "  %-15s %s (%11s) [%10s]\n", "Neighbor",

		   "last-seen", "throughput", "IF");

	seq_puts(seq,

		 "  Neighbor        last-seen ( throughput) [        IF]\n");



	rcu_read_lock();

	list_for_each_entry_rcu(hard_iface, &batadv_hardif_list, list) {
@@ -202,9 +202,8 @@ static void batadv_v_orig_print(struct batadv_priv *bat_priv, 
	int batman_count = 0;

	u32 i;



	seq_printf(seq, "  %-15s %s (%11s) %17s [%10s]: %20s ...\n",

		   "Originator", "last-seen", "throughput", "Nexthop",

		   "outgoingIF", "Potential nexthops");

	seq_puts(seq,

		 "  Originator      last-seen ( throughput)           Nexthop [outgoingIF]:   Potential nexthops ...\n");



	for (i = 0; i < hash->size; i++) {

		head = &hash->table[i];

net/batman-adv/bat_v_ogm.c

+98 −107
Original line number Diff line number Diff line
@@ -233,73 +233,6 @@ void batadv_v_ogm_primary_iface_set(struct batadv_hard_iface *primary_iface) 
	ether_addr_copy(ogm_packet->orig, primary_iface->net_dev->dev_addr);

}



/**

 * batadv_v_ogm_orig_update - update the originator status based on the received

 *  OGM

 * @bat_priv: the bat priv with all the soft interface information

 * @orig_node: the originator to update

 * @neigh_node: the neighbour the OGM has been received from (to update)

 * @ogm2: the received OGM

 * @if_outgoing: the interface where this OGM is going to be forwarded through

 */

static void

batadv_v_ogm_orig_update(struct batadv_priv *bat_priv,

			 struct batadv_orig_node *orig_node,

			 struct batadv_neigh_node *neigh_node,

			 const struct batadv_ogm2_packet *ogm2,

			 struct batadv_hard_iface *if_outgoing)

{

	struct batadv_neigh_ifinfo *router_ifinfo = NULL, *neigh_ifinfo = NULL;

	struct batadv_neigh_node *router = NULL;

	s32 neigh_seq_diff;

	u32 neigh_last_seqno;

	u32 router_last_seqno;

	u32 router_throughput, neigh_throughput;



	batadv_dbg(BATADV_DBG_BATMAN, bat_priv,

		   "Searching and updating originator entry of received packet\n");



	/* if this neighbor already is our next hop there is nothing

	 * to change

	 */

	router = batadv_orig_router_get(orig_node, if_outgoing);

	if (router == neigh_node)

		goto out;



	/* don't consider neighbours with worse throughput.

	 * also switch route if this seqno is BATADV_V_MAX_ORIGDIFF newer than

	 * the last received seqno from our best next hop.

	 */

	if (router) {

		router_ifinfo = batadv_neigh_ifinfo_get(router, if_outgoing);

		neigh_ifinfo = batadv_neigh_ifinfo_get(neigh_node, if_outgoing);



		/* if these are not allocated, something is wrong. */

		if (!router_ifinfo || !neigh_ifinfo)

			goto out;



		neigh_last_seqno = neigh_ifinfo->bat_v.last_seqno;

		router_last_seqno = router_ifinfo->bat_v.last_seqno;

		neigh_seq_diff = neigh_last_seqno - router_last_seqno;

		router_throughput = router_ifinfo->bat_v.throughput;

		neigh_throughput = neigh_ifinfo->bat_v.throughput;



		if ((neigh_seq_diff < BATADV_OGM_MAX_ORIGDIFF) &&

		    (router_throughput >= neigh_throughput))

			goto out;

	}



	batadv_update_route(bat_priv, orig_node, if_outgoing, neigh_node);



out:

	if (router_ifinfo)

		batadv_neigh_ifinfo_put(router_ifinfo);

	if (neigh_ifinfo)

		batadv_neigh_ifinfo_put(neigh_ifinfo);

	if (router)

		batadv_neigh_node_put(router);

}



/**

 * batadv_v_forward_penalty - apply a penalty to the throughput metric forwarded

 *  with B.A.T.M.A.N. V OGMs
@@ -347,10 +280,12 @@ static u32 batadv_v_forward_penalty(struct batadv_priv *bat_priv, 
}



/**

 * batadv_v_ogm_forward - forward an OGM to the given outgoing interface

 * batadv_v_ogm_forward - check conditions and forward an OGM to the given

 *  outgoing interface

 * @bat_priv: the bat priv with all the soft interface information

 * @ogm_received: previously received OGM to be forwarded

 * @throughput: throughput to announce, may vary per outgoing interface

 * @orig_node: the originator which has been updated

 * @neigh_node: the neigh_node through with the OGM has been received

 * @if_incoming: the interface on which this OGM was received on

 * @if_outgoing: the interface to which the OGM has to be forwarded to

 *
@@ -359,28 +294,57 @@ static u32 batadv_v_forward_penalty(struct batadv_priv *bat_priv, 
 */

static void batadv_v_ogm_forward(struct batadv_priv *bat_priv,

				 const struct batadv_ogm2_packet *ogm_received,

				 u32 throughput,

				 struct batadv_orig_node *orig_node,

				 struct batadv_neigh_node *neigh_node,

				 struct batadv_hard_iface *if_incoming,

				 struct batadv_hard_iface *if_outgoing)

{

	struct batadv_neigh_ifinfo *neigh_ifinfo = NULL;

	struct batadv_orig_ifinfo *orig_ifinfo = NULL;

	struct batadv_neigh_node *router = NULL;

	struct batadv_ogm2_packet *ogm_forward;

	unsigned char *skb_buff;

	struct sk_buff *skb;

	size_t packet_len;

	u16 tvlv_len;



	/* only forward for specific interfaces, not for the default one. */

	if (if_outgoing == BATADV_IF_DEFAULT)

		goto out;



	orig_ifinfo = batadv_orig_ifinfo_new(orig_node, if_outgoing);

	if (!orig_ifinfo)

		goto out;



	/* acquire possibly updated router */

	router = batadv_orig_router_get(orig_node, if_outgoing);



	/* strict rule: forward packets coming from the best next hop only */

	if (neigh_node != router)

		goto out;



	/* don't forward the same seqno twice on one interface */

	if (orig_ifinfo->last_seqno_forwarded == ntohl(ogm_received->seqno))

		goto out;



	orig_ifinfo->last_seqno_forwarded = ntohl(ogm_received->seqno);



	if (ogm_received->ttl <= 1) {

		batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "ttl exceeded\n");

		return;

		goto out;

	}



	neigh_ifinfo = batadv_neigh_ifinfo_get(neigh_node, if_outgoing);

	if (!neigh_ifinfo)

		goto out;



	tvlv_len = ntohs(ogm_received->tvlv_len);



	packet_len = BATADV_OGM2_HLEN + tvlv_len;

	skb = netdev_alloc_skb_ip_align(if_outgoing->net_dev,

					ETH_HLEN + packet_len);

	if (!skb)

		return;

		goto out;



	skb_reserve(skb, ETH_HLEN);

	skb_buff = skb_put(skb, packet_len);
@@ -388,15 +352,23 @@ static void batadv_v_ogm_forward(struct batadv_priv *bat_priv, 


	/* apply forward penalty */

	ogm_forward = (struct batadv_ogm2_packet *)skb_buff;

	ogm_forward->throughput = htonl(throughput);

	ogm_forward->throughput = htonl(neigh_ifinfo->bat_v.throughput);

	ogm_forward->ttl--;



	batadv_dbg(BATADV_DBG_BATMAN, bat_priv,

		   "Forwarding OGM2 packet on %s: throughput %u, ttl %u, received via %s\n",

		   if_outgoing->net_dev->name, throughput, ogm_forward->ttl,

		   if_incoming->net_dev->name);

		   if_outgoing->net_dev->name, ntohl(ogm_forward->throughput),

		   ogm_forward->ttl, if_incoming->net_dev->name);



	batadv_v_ogm_send_to_if(skb, if_outgoing);



out:

	if (orig_ifinfo)

		batadv_orig_ifinfo_put(orig_ifinfo);

	if (router)

		batadv_neigh_node_put(router);

	if (neigh_ifinfo)

		batadv_neigh_ifinfo_put(neigh_ifinfo);

}



/**
@@ -493,8 +465,10 @@ static int batadv_v_ogm_metric_update(struct batadv_priv *bat_priv, 
 * @neigh_node: the neigh_node through with the OGM has been received

 * @if_incoming: the interface where this packet was received

 * @if_outgoing: the interface for which the packet should be considered

 *

 * Return: true if the packet should be forwarded, false otherwise

 */

static void batadv_v_ogm_route_update(struct batadv_priv *bat_priv,

static bool batadv_v_ogm_route_update(struct batadv_priv *bat_priv,

				      const struct ethhdr *ethhdr,

				      const struct batadv_ogm2_packet *ogm2,

				      struct batadv_orig_node *orig_node,
@@ -503,14 +477,14 @@ static void batadv_v_ogm_route_update(struct batadv_priv *bat_priv, 
				      struct batadv_hard_iface *if_outgoing)

{

	struct batadv_neigh_node *router = NULL;

	struct batadv_neigh_ifinfo *neigh_ifinfo = NULL;

	struct batadv_orig_node *orig_neigh_node = NULL;

	struct batadv_orig_ifinfo *orig_ifinfo = NULL;

	struct batadv_neigh_node *orig_neigh_router = NULL;



	neigh_ifinfo = batadv_neigh_ifinfo_get(neigh_node, if_outgoing);

	if (!neigh_ifinfo)

		goto out;

	struct batadv_neigh_ifinfo *router_ifinfo = NULL, *neigh_ifinfo = NULL;

	u32 router_throughput, neigh_throughput;

	u32 router_last_seqno;

	u32 neigh_last_seqno;

	s32 neigh_seq_diff;

	bool forward = false;



	orig_neigh_node = batadv_v_ogm_orig_get(bat_priv, ethhdr->h_source);

	if (!orig_neigh_node)
@@ -529,47 +503,57 @@ static void batadv_v_ogm_route_update(struct batadv_priv *bat_priv, 
		goto out;

	}



	if (router)

		batadv_neigh_node_put(router);

	/* Mark the OGM to be considered for forwarding, and update routes

	 * if needed.

	 */

	forward = true;



	/* Update routes, and check if the OGM is from the best next hop */

	batadv_v_ogm_orig_update(bat_priv, orig_node, neigh_node, ogm2,

				 if_outgoing);

	batadv_dbg(BATADV_DBG_BATMAN, bat_priv,

		   "Searching and updating originator entry of received packet\n");



	orig_ifinfo = batadv_orig_ifinfo_new(orig_node, if_outgoing);

	if (!orig_ifinfo)

	/* if this neighbor already is our next hop there is nothing

	 * to change

	 */

	if (router == neigh_node)

		goto out;



	/* don't forward the same seqno twice on one interface */

	if (orig_ifinfo->last_seqno_forwarded == ntohl(ogm2->seqno))

	/* don't consider neighbours with worse throughput.

	 * also switch route if this seqno is BATADV_V_MAX_ORIGDIFF newer than

	 * the last received seqno from our best next hop.

	 */

	if (router) {

		router_ifinfo = batadv_neigh_ifinfo_get(router, if_outgoing);

		neigh_ifinfo = batadv_neigh_ifinfo_get(neigh_node, if_outgoing);



		/* if these are not allocated, something is wrong. */

		if (!router_ifinfo || !neigh_ifinfo)

			goto out;



	/* acquire possibly updated router */

	router = batadv_orig_router_get(orig_node, if_outgoing);

		neigh_last_seqno = neigh_ifinfo->bat_v.last_seqno;

		router_last_seqno = router_ifinfo->bat_v.last_seqno;

		neigh_seq_diff = neigh_last_seqno - router_last_seqno;

		router_throughput = router_ifinfo->bat_v.throughput;

		neigh_throughput = neigh_ifinfo->bat_v.throughput;



	/* strict rule: forward packets coming from the best next hop only */

	if (neigh_node != router)

		if ((neigh_seq_diff < BATADV_OGM_MAX_ORIGDIFF) &&

		    (router_throughput >= neigh_throughput))

			goto out;



	/* only forward for specific interface, not for the default one. */

	if (if_outgoing != BATADV_IF_DEFAULT) {

		orig_ifinfo->last_seqno_forwarded = ntohl(ogm2->seqno);

		batadv_v_ogm_forward(bat_priv, ogm2,

				     neigh_ifinfo->bat_v.throughput,

				     if_incoming, if_outgoing);

	}



	batadv_update_route(bat_priv, orig_node, if_outgoing, neigh_node);

out:

	if (orig_ifinfo)

		batadv_orig_ifinfo_put(orig_ifinfo);

	if (router)

		batadv_neigh_node_put(router);

	if (orig_neigh_router)

		batadv_neigh_node_put(orig_neigh_router);

	if (orig_neigh_node)

		batadv_orig_node_put(orig_neigh_node);

	if (router_ifinfo)

		batadv_neigh_ifinfo_put(router_ifinfo);

	if (neigh_ifinfo)

		batadv_neigh_ifinfo_put(neigh_ifinfo);



	return forward;

}



/**
@@ -592,6 +576,7 @@ batadv_v_ogm_process_per_outif(struct batadv_priv *bat_priv, 
			       struct batadv_hard_iface *if_outgoing)

{

	int seqno_age;

	bool forward;



	/* first, update the metric with according sanity checks */

	seqno_age = batadv_v_ogm_metric_update(bat_priv, ogm2, orig_node,
@@ -610,8 +595,14 @@ batadv_v_ogm_process_per_outif(struct batadv_priv *bat_priv, 
					       ntohs(ogm2->tvlv_len));



	/* if the metric update went through, update routes if needed */

	batadv_v_ogm_route_update(bat_priv, ethhdr, ogm2, orig_node,

				  neigh_node, if_incoming, if_outgoing);

	forward = batadv_v_ogm_route_update(bat_priv, ethhdr, ogm2, orig_node,

					    neigh_node, if_incoming,

					    if_outgoing);



	/* if the routes have been processed correctly, check and forward */

	if (forward)

		batadv_v_ogm_forward(bat_priv, ogm2, orig_node, neigh_node,

				     if_incoming, if_outgoing);

}



/**

net/batman-adv/bridge_loop_avoidance.c

+9 −10
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ static int batadv_compare_backbone_gw(const struct hlist_node *node, 
}



/**

 * batadv_compare_backbone_gw - compare address and vid of two claims

 * batadv_compare_claim - compare address and vid of two claims

 * @node: list node of the first entry to compare

 * @data2: pointer to the second claims

 *
@@ -200,8 +200,8 @@ static void batadv_claim_put(struct batadv_bla_claim *claim) 
 *

 * Return: claim if found or NULL otherwise.

 */

static struct batadv_bla_claim

*batadv_claim_hash_find(struct batadv_priv *bat_priv,

static struct batadv_bla_claim *

batadv_claim_hash_find(struct batadv_priv *bat_priv,

		       struct batadv_bla_claim *data)

{

	struct batadv_hashtable *hash = bat_priv->bla.claim_hash;
@@ -1303,7 +1303,7 @@ static void batadv_bla_periodic_work(struct work_struct *work) 
	struct batadv_hard_iface *primary_if;

	int i;



	delayed_work = container_of(work, struct delayed_work, work);

	delayed_work = to_delayed_work(work);

	priv_bla = container_of(delayed_work, struct batadv_priv_bla, work);

	bat_priv = container_of(priv_bla, struct batadv_priv, bla);

	primary_if = batadv_primary_if_get_selected(bat_priv);
@@ -1575,7 +1575,7 @@ int batadv_bla_is_backbone_gw(struct sk_buff *skb, 
}



/**

 * batadv_bla_init - free all bla structures

 * batadv_bla_free - free all bla structures

 * @bat_priv: the bat priv with all the soft interface information

 *

 * for softinterface free or module unload
@@ -1815,8 +1815,8 @@ int batadv_bla_claim_table_seq_print_text(struct seq_file *seq, void *offset) 
		   "Claims announced for the mesh %s (orig %pM, group id %#.4x)\n",

		   net_dev->name, primary_addr,

		   ntohs(bat_priv->bla.claim_dest.group));

	seq_printf(seq, "   %-17s    %-5s    %-17s [o] (%-6s)\n",

		   "Client", "VID", "Originator", "CRC");

	seq_puts(seq,

		 "   Client               VID      Originator        [o] (CRC   )\n");

	for (i = 0; i < hash->size; i++) {

		head = &hash->table[i];
@@ -1873,8 +1873,7 @@ int batadv_bla_backbone_table_seq_print_text(struct seq_file *seq, void *offset) 
		   "Backbones announced for the mesh %s (orig %pM, group id %#.4x)\n",

		   net_dev->name, primary_addr,

		   ntohs(bat_priv->bla.claim_dest.group));

	seq_printf(seq, "   %-17s    %-5s %-9s (%-6s)\n",

		   "Originator", "VID", "last seen", "CRC");

	seq_puts(seq, "   Originator           VID   last seen (CRC   )\n");

	for (i = 0; i < hash->size; i++) {

		head = &hash->table[i];