diff options
| -rw-r--r-- | net/batman-adv/translation-table.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 0225616d5771..7fa3a0a0524a 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c | |||
| @@ -862,7 +862,7 @@ batadv_tt_prepare_tvlv_global_data(struct batadv_orig_node *orig_node, | |||
| 862 | struct batadv_orig_node_vlan *vlan; | 862 | struct batadv_orig_node_vlan *vlan; |
| 863 | u8 *tt_change_ptr; | 863 | u8 *tt_change_ptr; |
| 864 | 864 | ||
| 865 | rcu_read_lock(); | 865 | spin_lock_bh(&orig_node->vlan_list_lock); |
| 866 | hlist_for_each_entry_rcu(vlan, &orig_node->vlan_list, list) { | 866 | hlist_for_each_entry_rcu(vlan, &orig_node->vlan_list, list) { |
| 867 | num_vlan++; | 867 | num_vlan++; |
| 868 | num_entries += atomic_read(&vlan->tt.num_entries); | 868 | num_entries += atomic_read(&vlan->tt.num_entries); |
| @@ -900,7 +900,7 @@ batadv_tt_prepare_tvlv_global_data(struct batadv_orig_node *orig_node, | |||
| 900 | *tt_change = (struct batadv_tvlv_tt_change *)tt_change_ptr; | 900 | *tt_change = (struct batadv_tvlv_tt_change *)tt_change_ptr; |
| 901 | 901 | ||
| 902 | out: | 902 | out: |
| 903 | rcu_read_unlock(); | 903 | spin_unlock_bh(&orig_node->vlan_list_lock); |
| 904 | return tvlv_len; | 904 | return tvlv_len; |
| 905 | } | 905 | } |
| 906 | 906 | ||
| @@ -936,7 +936,7 @@ batadv_tt_prepare_tvlv_local_data(struct batadv_priv *bat_priv, | |||
| 936 | u8 *tt_change_ptr; | 936 | u8 *tt_change_ptr; |
| 937 | int change_offset; | 937 | int change_offset; |
| 938 | 938 | ||
| 939 | rcu_read_lock(); | 939 | spin_lock_bh(&bat_priv->softif_vlan_list_lock); |
| 940 | hlist_for_each_entry_rcu(vlan, &bat_priv->softif_vlan_list, list) { | 940 | hlist_for_each_entry_rcu(vlan, &bat_priv->softif_vlan_list, list) { |
| 941 | num_vlan++; | 941 | num_vlan++; |
| 942 | num_entries += atomic_read(&vlan->tt.num_entries); | 942 | num_entries += atomic_read(&vlan->tt.num_entries); |
| @@ -974,7 +974,7 @@ batadv_tt_prepare_tvlv_local_data(struct batadv_priv *bat_priv, | |||
| 974 | *tt_change = (struct batadv_tvlv_tt_change *)tt_change_ptr; | 974 | *tt_change = (struct batadv_tvlv_tt_change *)tt_change_ptr; |
| 975 | 975 | ||
| 976 | out: | 976 | out: |
| 977 | rcu_read_unlock(); | 977 | spin_unlock_bh(&bat_priv->softif_vlan_list_lock); |
| 978 | return tvlv_len; | 978 | return tvlv_len; |
| 979 | } | 979 | } |
| 980 | 980 | ||
