Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code »

Commit a5164886b0bdadd662f9715a7541432c4d1a0d99

Authored by Linus Lüssing
Committed by Antonio Quartulli
1 parent e8829f007e
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

batman-adv: fix multicast counter when purging originators 

When purging an orig_node we should only decrease counter tracking the
number of nodes without multicast optimizations support if it was
increased through this orig_node before.

A not yet quite initialized orig_node (meaning it did not have its turn
in the mcast-tvlv handler so far) which gets purged would not adhere to
this and will lead to a counter imbalance.

Fixing this by adding a check whether the orig_node is mcast-initalized
before decreasing the counter in the mcast-orig_node-purging routine.

Introduced by 60432d756cf06e597ef9da511402dd059b112447
("batman-adv: Announce new capability via multicast TVLV")

Reported-by: Tobias Hachmer <tobias@hachmer.de>
Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>

Showing 1 changed file with 2 additions and 1 deletions Side-by-side Diff

net/batman-adv/multicast.c
Diff comments   View file @ a516488
... ... @@ -740,7 +740,8 @@
740 740 {
741 741 struct batadv_priv *bat_priv = orig->bat_priv;
742 742  
743   - if (!(orig->capabilities & BATADV_ORIG_CAPA_HAS_MCAST))
  743 + if (!(orig->capabilities & BATADV_ORIG_CAPA_HAS_MCAST) &&
  744 + orig->capa_initialized & BATADV_ORIG_CAPA_HAS_MCAST)
744 745 atomic_dec(&bat_priv->mcast.num_disabled);
745 746  
746 747 batadv_mcast_want_unsnoop_update(bat_priv, orig, BATADV_NO_FLAGS);