Repository : ssh://git@open-mesh.org/batman-adv

On branch : master

commit f1b48f24cd055f03c3006f0be76b217493380a93 Merge: aa203f7 cc063e9 Author: Marek Lindner mareklindner@neomailbox.ch Date: Tue Jul 7 16:49:13 2015 +0800

Merge branch 'next'

f1b48f24cd055f03c3006f0be76b217493380a93 net/batman-adv/distributed-arp-table.c | 2 +- net/batman-adv/multicast.c | 11 ++++++----- net/batman-adv/network-coding.c | 2 +- net/batman-adv/translation-table.c | 3 ++- net/batman-adv/types.h | 8 ++++---- 5 files changed, 14 insertions(+), 12 deletions(-)

diff --cc net/batman-adv/multicast.c index c64d9b1,deb51ad..8fa9af2 --- a/net/batman-adv/multicast.c +++ b/net/batman-adv/multicast.c @@@ -731,10 -729,11 +731,11 @@@ static void batadv_mcast_tvlv_ogm_handl

if (orig_mcast_enabled && tvlv_value && (tvlv_value_len >= sizeof(mcast_flags))) - mcast_flags = *(uint8_t *)tvlv_value; + mcast_flags = *(u8 *)tvlv_value;

spin_lock_bh(&orig->mcast_handler_lock); - orig_initialized = orig->capa_initialized & BATADV_ORIG_CAPA_HAS_MCAST; + orig_initialized = test_bit(BATADV_ORIG_CAPA_HAS_MCAST, + &orig->capa_initialized);

/* If mcast support is turned on decrease the disabled mcast node * counter only if we had increased it for this node before. If this