Merge tag 'batadv-next-for-davem-20200306' of git://git.open-mesh.org/linux-merge

Simon Wunderlich says:

====================
This cleanup patchset includes the following patches:

 - bump version strings, by Simon Wunderlich

 - Avoid RCU list-traversal in spinlock, by Sven Eckelmann

 - Replace zero-length array with flexible-array member,
   by Gustavo A. R. Silva
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c
index 3d21dd83f8cccb117b9ceb8ba81a5d16d842fe06..b85da4b7a77b67895c9b8ea6aa559943ee3494e3 100644 (file)
--- a/net/batman-adv/distributed-arp-table.c
+++ b/net/batman-adv/distributed-arp-table.c
@@ -88,7 +88,7 @@ struct batadv_dhcp_packet {
        __u8 sname[64];
        __u8 file[128];
        __be32 magic;
-       __u8 options[0];
+       __u8 options[];
 };
 
 #define BATADV_DHCP_YIADDR_LEN sizeof(((struct batadv_dhcp_packet *)0)->yiaddr)

diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h
index 692306df7b6f621e072f8e7819795c36b00cf970..2a234d0ad445edf119b46f919ea597dde4d7e336 100644 (file)
--- a/net/batman-adv/main.h
+++ b/net/batman-adv/main.h
@@ -13,7 +13,7 @@
 #define BATADV_DRIVER_DEVICE "batman-adv"
 
 #ifndef BATADV_SOURCE_VERSION
-#define BATADV_SOURCE_VERSION "2020.0"
+#define BATADV_SOURCE_VERSION "2020.1"
 #endif
 
 /* B.A.T.M.A.N. parameters */

diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c
index 852932838ddc4fd8e77050c2334a29406c07dabe..a9635c882fe0152adb44eb5f4a6179101ce18b64 100644 (file)
--- 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,
        u8 *tt_change_ptr;
 
        spin_lock_bh(&orig_node->vlan_list_lock);
-       hlist_for_each_entry_rcu(vlan, &orig_node->vlan_list, list) {
+       hlist_for_each_entry(vlan, &orig_node->vlan_list, list) {
                num_vlan++;
                num_entries += atomic_read(&vlan->tt.num_entries);
        }
@@ -888,7 +888,7 @@ batadv_tt_prepare_tvlv_global_data(struct batadv_orig_node *orig_node,
        (*tt_data)->num_vlan = htons(num_vlan);
 
        tt_vlan = (struct batadv_tvlv_tt_vlan_data *)(*tt_data + 1);
-       hlist_for_each_entry_rcu(vlan, &orig_node->vlan_list, list) {
+       hlist_for_each_entry(vlan, &orig_node->vlan_list, list) {
                tt_vlan->vid = htons(vlan->vid);
                tt_vlan->crc = htonl(vlan->tt.crc);
 
@@ -937,7 +937,7 @@ batadv_tt_prepare_tvlv_local_data(struct batadv_priv *bat_priv,
        int change_offset;
 
        spin_lock_bh(&bat_priv->softif_vlan_list_lock);
-       hlist_for_each_entry_rcu(vlan, &bat_priv->softif_vlan_list, list) {
+       hlist_for_each_entry(vlan, &bat_priv->softif_vlan_list, list) {
                vlan_entries = atomic_read(&vlan->tt.num_entries);
                if (vlan_entries < 1)
                        continue;
@@ -967,7 +967,7 @@ batadv_tt_prepare_tvlv_local_data(struct batadv_priv *bat_priv,
        (*tt_data)->num_vlan = htons(num_vlan);
 
        tt_vlan = (struct batadv_tvlv_tt_vlan_data *)(*tt_data + 1);
-       hlist_for_each_entry_rcu(vlan, &bat_priv->softif_vlan_list, list) {
+       hlist_for_each_entry(vlan, &bat_priv->softif_vlan_list, list) {
                vlan_entries = atomic_read(&vlan->tt.num_entries);
                if (vlan_entries < 1)
                        continue;