The following commit has been merged in the merge/master branch: commit f808f1877a5abaf990e6c21daf63edadac849676 Merge: 5d36bdebdf639983544a34b1dbecbee98cb9e531 f58a0b03873fd3aa9568c11af198f997ed2208cc Author: Marek Lindner mareklindner@neomailbox.ch Date: Sat May 7 20:32:53 2016 +0800

Merge branch 'maint' into next

diff --combined net/batman-adv/bat_v.c index 9e2d129,0caca2f..602e03e --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@@ -39,6 -39,16 +39,16 @@@

static void batadv_v_iface_activate(struct batadv_hard_iface *hard_iface) { + struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface); + struct batadv_hard_iface *primary_if; + + primary_if = batadv_primary_if_get_selected(bat_priv); + + if (primary_if) { + batadv_v_elp_iface_activate(primary_if, hard_iface); + batadv_hardif_put(primary_if); + } + /* B.A.T.M.A.N. V does not use any queuing mechanism, therefore it can * set the interface as ACTIVE right away, without any risk of race * condition @@@ -180,8 -190,8 +190,8 @@@ static void batadv_v_neigh_print(struc 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) { @@@ -220,8 -230,9 +230,8 @@@ static void batadv_v_orig_print(struct 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];