[commits] [batman-adv] master: Merge branch 'netdev' (7af748af)

Repository : ssh://git@diktynna/batman-adv

On branch : master

commit 7af748af38ad44023de7d2714467304ba273e7c0 Merge: 9881e811 6c69b5d8 Author: Sven Eckelmann sven@narfation.org Date: Wed Oct 20 20:15:06 2021 +0200

Merge branch 'netdev'

7af748af38ad44023de7d2714467304ba273e7c0 net/batman-adv/bridge_loop_avoidance.c | 14 +++++++------- net/batman-adv/multicast.c | 2 +- net/batman-adv/routing.c | 3 ++- net/batman-adv/soft-interface.c | 2 +- net/batman-adv/tp_meter.c | 2 +- net/batman-adv/tvlv.c | 4 ++-- net/batman-adv/tvlv.h | 4 ++-- 7 files changed, 16 insertions(+), 15 deletions(-)