diff options
-rw-r--r-- | net/batman-adv/originator.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index fe2fcda4a984..ab8c4f9738fe 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c | |||
@@ -766,6 +766,7 @@ static void batadv_orig_node_release(struct kref *ref) | |||
766 | struct batadv_orig_node *orig_node; | 766 | struct batadv_orig_node *orig_node; |
767 | struct batadv_orig_ifinfo *orig_ifinfo; | 767 | struct batadv_orig_ifinfo *orig_ifinfo; |
768 | struct batadv_orig_node_vlan *vlan; | 768 | struct batadv_orig_node_vlan *vlan; |
769 | struct batadv_orig_ifinfo *last_candidate; | ||
769 | 770 | ||
770 | orig_node = container_of(ref, struct batadv_orig_node, refcount); | 771 | orig_node = container_of(ref, struct batadv_orig_node, refcount); |
771 | 772 | ||
@@ -783,8 +784,14 @@ static void batadv_orig_node_release(struct kref *ref) | |||
783 | hlist_del_rcu(&orig_ifinfo->list); | 784 | hlist_del_rcu(&orig_ifinfo->list); |
784 | batadv_orig_ifinfo_put(orig_ifinfo); | 785 | batadv_orig_ifinfo_put(orig_ifinfo); |
785 | } | 786 | } |
787 | |||
788 | last_candidate = orig_node->last_bonding_candidate; | ||
789 | orig_node->last_bonding_candidate = NULL; | ||
786 | spin_unlock_bh(&orig_node->neigh_list_lock); | 790 | spin_unlock_bh(&orig_node->neigh_list_lock); |
787 | 791 | ||
792 | if (last_candidate) | ||
793 | batadv_orig_ifinfo_put(last_candidate); | ||
794 | |||
788 | spin_lock_bh(&orig_node->vlan_list_lock); | 795 | spin_lock_bh(&orig_node->vlan_list_lock); |
789 | hlist_for_each_entry_safe(vlan, node_tmp, &orig_node->vlan_list, list) { | 796 | hlist_for_each_entry_safe(vlan, node_tmp, &orig_node->vlan_list, list) { |
790 | hlist_del_rcu(&vlan->list); | 797 | hlist_del_rcu(&vlan->list); |